Attachment #62655 for bug #12310

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

Lines 379-385 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-1 / +1 lines)
379	<input type="text" id="budget_period_total" name="budget_period_total"	379	<input type="text" id="budget_period_total" name="budget_period_total"
380	size="10" maxlength="80" value="[% budget_period_total \| $Price on_editing => 1 %]" onchange="CheckTot(budget_period_total)" />	380	size="10" maxlength="80" value="[% budget_period_total \| $Price on_editing => 1 %]" onchange="CheckTot(budget_period_total)" />
381	[% IF Koha.Preference('DigitSeparator') %]	381	[% IF Koha.Preference('DigitSeparator') %]
382	Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX", if you want to change it, click here <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here	382	Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX", if you want to change it, click <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
383	</a>	383	</a>
384	[% ELSE %]	384	[% ELSE %]
385	Please chose a digit separator by clicking <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here </a>	385	Please chose a digit separator by clicking <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here </a>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-3 / +46 lines)
1	[% USE AuthorisedValues %]	1	[% USE AuthorisedValues %]
2	[% USE Branches %]	2	[% USE Branches %]
3	[% USE Price %]	3	[% USE Price %]
		4	[% USE Koha %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF op == 'add_form' %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>	6	<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF op == 'add_form' %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
Lines 14-19 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
14		15
15	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>	16	<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
16	[% IF op == 'add_form' %]	17	[% IF op == 'add_form' %]
		18	[% INCLUDE 'prices.inc' %]
17	<script type="text/javascript">	19	<script type="text/javascript">
18	//<![CDATA[	20	//<![CDATA[
19		21
Lines 144-150 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
144	alert(alertString2);	146	alert(alertString2);
145	}	147	}
146	}	148	}
		149
		150
147	$(document).ready(function(){	151	$(document).ready(function(){
		152	$('#budget_expend').on('change', function(){CheckAmount(this)});
		153	$('#budget_amount').on('change', function(){CheckAmount(this)});
		154	function CheckAmount(f){
		155	var ok=1;
		156	var _alertString="";
		157	var alertString2;
		158	if (!(isPrice(f.value))) {
		159	_alertString += "\n- " + _("Amount must be a valid number, or empty");
		160	}else{
		161	f.value=Price_from_string(f.value);
		162
		163	}
		164	if (_alertString.length==0) {
		165	return true;
		166	} else {
		167	alertString2 = _("Form not submitted because of the following problem(s)");
		168	alertString2 += "\n------------------------------------------------------------------------------------\n";
		169	alertString2 += _alertString;
		170	alert(alertString2);
		171	return false;
		172	}
		173	}
		174
148	$("#remove_owner").on("click",function(e){	175	$("#remove_owner").on("click",function(e){
149	e.preventDefault();	176	e.preventDefault();
150	ownerRemove();	177	ownerRemove();
Lines 486-491 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
486	<li>	513	<li>
487	<label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>	514	<label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
488	<input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount \| $Price on_editing => 1 %]" size="8" />	515	<input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount \| $Price on_editing => 1 %]" size="8" />
		516	<span class="hint">
		517	[% IF Koha.Preference('DigitSeparator') %]Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(
		518	0,1) %]XX", if you want to change it, click <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
		519	</a>
		520	[% ELSE %]Please chose a digit separator by clicking <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
		521	</a>
		522	[% END %]
		523	</span>
		524
489	</li>	525	</li>
490		526
491	<li>	527	<li>
Lines 495-503 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
495	</li>	531	</li>
496		532
497	<li>	533	<li>
498	<label for="budget_expend">Warning at (amount): </label>	534	<label for="budget_expend">Warning at (amount): </label>
499	<input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend \| $Price on_editing => 1 %]" size="10" />	535	<input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend \| $Price on_editing => 1 %]" size="10" />
500	<span class="hint">0 to disable</span>	536	<span class="hint">0 to disable.
		537	[% IF Koha.Preference('DigitSeparator') %]Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(
		538	0,1) %]XX", if you want to change it, click <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
		539	</a>
		540	[% ELSE %]Please chose a digit separator by clicking <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
		541	</a>
		542	[% END %]
		543	</span>
501	</li>	544	</li>
502		545
503	<li>	546	<li>




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Patrons &rsaquo; Create manual credit</title>
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'prices.inc' %]
<script type="text/javascript">
//<![CDATA[
$(document).ready(function(){
        $('#mancredit').preventDoubleFormSubmit();
        $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
        $('#amount').on('change', function(){Check(this)});
        function Check(f){
            var ok=1;
            var _alertString="";
            var alertString2;
            if (!(isPrice(f.value))) {
                _alertString += "\n- " + _("Amount must be a valid number, or empty");
            }else{
                f.value=Price_from_string(f.value);
            }
            if (_alertString.length==0) {
                return true;
            } else {
                alertString2  = _("Error: ");
                alertString2 += "\n------------------------------------------------------------------------------------\n";
                alertString2 += _alertString;
                alert(alertString2);
                return false;
            }
        }
});
//]]>
</script>
</head>
<body id="pat_mancredit" class="pat">

	<li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
	<li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
    <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
    <li><label for="amount">Amount: </label><input name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
<span class="hint">
    [% IF Koha.Preference('DigitSeparator') %]Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(
0,1) %]XX", if you want to change it, click <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
</a>
    [% ELSE %]Please chose a digit separator by clicking <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
</a>
    [% END %]
</span>

</ol></fieldset>

<fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>

Lines 68-74 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-2 / +8 lines)
68	<li><label for="desc">Description: </label><input type="text" name="desc" id="desc" size="50" /></li>	68	<li><label for="desc">Description: </label><input type="text" name="desc" id="desc" size="50" /></li>
69	<li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>	69	<li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
70	<li><label for="amount">Amount: </label><input type="text" name="amount" id="amount" required="required"/>	70	<li><label for="amount">Amount: </label><input type="text" name="amount" id="amount" required="required"/>
71	Please use the "[% Koha.Preference('DigitSeparator').substr(0, 1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX"	71	<span class="hint">
		72	[% IF Koha.Preference('DigitSeparator') %]Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(
		73	0,1) %]XX", if you want to change it, click <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
		74	</a>
		75	[% ELSE %]Please chose a digit separator by clicking <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=DigitSeparator">here
		76	</a>
		77	[% END %]
		78	</span>
72	</li>	79	</li>
73	</ol></fieldset>	80	</ol></fieldset>
74	<fieldset class="action"><input type="submit" name="add" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>	81	<fieldset class="action"><input type="submit" name="add" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
75	-

Return to bug 12310