Attachment #53860 for bug #17014

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

Lines 2-10 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc (-3 / +3 lines)
2	[% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]	2	[% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %]
3	[% Koha.Preference('IntranetSlipPrinterJS') %]	3	[% Koha.Preference('IntranetSlipPrinterJS') %]
4	[% ELSE %]	4	[% ELSE %]
5	function printThenClose() {	5	$( window ).load(function() {
6	window.print();	6	window.print();
7	setTimeout('window.close()', 1);	7	setTimeout('window.close()', 1);
8	}	8	});
9	[% END %]	9	[% END %]
10	</script>	10	</script>

Lines 19-25 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt (-1 / +1 lines)
19		19
20	[% INCLUDE 'slip-print.inc' #printThenClose %]	20	[% INCLUDE 'slip-print.inc' #printThenClose %]
21	</head>	21	</head>
22	<body id="circ_printslip" class="circ" onload="printThenClose();">	22	<body id="circ_printslip" class="circ">
23	<div id="receipt">	23	<div id="receipt">
24		24
25	[% IF plain %]	25	[% IF plain %]

Lines 4-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-12 / +14 lines)
4	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
5	<script type="text/javascript">	5	<script type="text/javascript">
6	//<![CDATA[	6	//<![CDATA[
		7	var type_fees = new Array();
		8	type_fees['L'] = '';
		9	type_fees['F'] = '';
		10	type_fees['A'] = '';
		11	type_fees['N'] = '';
		12	type_fees['M'] = '';
		13	[% FOREACH invoice_types_loo IN invoice_types_loop %]
		14	type_fees['[% invoice_types_loo.authorised_value %]'] = "[% invoice_types_loo.lib %]";
		15	[% END %]
7	$(document).ready(function(){	16	$(document).ready(function(){
8	$('#maninvoice').preventDoubleFormSubmit();	17	$('#maninvoice').preventDoubleFormSubmit();
9	$("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");	18	$("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
		19	$("#invoice_type").on("change",function(){
		20	this.form.desc.value = this.options[this.selectedIndex].value;
		21	this.form.amount.value = type_fees[this.options[this.selectedIndex].value];
		22	});
10	});	23	});
11	//]]>	24	//]]>
12	</script>	25	</script>
Lines 44-62 $(document).ready(function(){ Link Here
44	<legend>Manual invoice</legend>	57	<legend>Manual invoice</legend>
45	<ol>	58	<ol>
46	<li>	59	<li>
47	<script type="text/javascript">
48	var type_fees = new Array();
49	type_fees['L'] = '';
50	type_fees['F'] = '';
51	type_fees['A'] = '';
52	type_fees['N'] = '';
53	type_fees['M'] = '';
54	[% FOREACH invoice_types_loo IN invoice_types_loop %]
55	type_fees['[% invoice_types_loo.authorised_value %]'] = "[% invoice_types_loo.lib %]";
56	[% END %]
57	</script>
58	<label for="type">Type: </label>	60	<label for="type">Type: </label>
59	<select name="type" id="type" onchange="this.form.desc.value=this.options[this.selectedIndex].value; this.form.amount.value=type_fees[this.options[this.selectedIndex].value];">	61	<select name="type" id="invoice_type">
60	<option value="L">Lost item</option>	62	<option value="L">Lost item</option>
61	<option value="F">Fine</option>	63	<option value="F">Fine</option>
62	<option value="A">Account management fee</option>	64	<option value="A">Account management fee</option>

Lines 109-114 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +4 lines)
109	e.preventDefault();	109	e.preventDefault();
110	clearFilters(true);	110	clearFilters(true);
111	});	111	});
		112	$("#searchform").on("submit",function(){
		113	return filter();
		114	});
112	});	115	});
113		116
114	var dtMemberResults;	117	var dtMemberResults;
Lines 418-424 function filterByFirstLetterSurname(letter) { Link Here
418	</div>	421	</div>
419	</div>	422	</div>
420	<div class="yui-b">	423	<div class="yui-b">
421	<form onsubmit="return filter();" id="searchform">	424	<form method="get" id="searchform">
422	<input type="hidden" id="firstletter_filter" value="" />	425	<input type="hidden" id="firstletter_filter" value="" />
423	<fieldset class="brief">	426	<fieldset class="brief">
424	<h3>Filters</h3>	427	<h3>Filters</h3>




[% INCLUDE 'doc-head-open.inc' %]
    <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
    [% INCLUDE 'doc-head-close.inc' %]
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" />
    [% INCLUDE 'slip-print.inc' #printThenClose %]
</head>
<body id="pat_moremember-print" class="pat">
    <div id="main">
        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>


Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt (-1 / +1 lines)
8		8
9	[% INCLUDE 'slip-print.inc' #printThenClose %]	9	[% INCLUDE 'slip-print.inc' #printThenClose %]
10	</head>	10	</head>
11	<body id="pat_moremember-receipt" class="pat" onload="printThenClose();">	11	<body id="pat_moremember-receipt" class="pat">
12		12
13	<div id="receipt">	13	<div id="receipt">
14		14

Lines 6-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-8 / +8 lines)
6	//<![CDATA[	6	//<![CDATA[
7	$(document).ready(function() {	7	$(document).ready(function() {
8	$('#payindivfine, #woindivfine, #payfine').preventDoubleFormSubmit();	8	$('#payindivfine, #woindivfine, #payfine').preventDoubleFormSubmit();
		9	$("#paid").on("change",function(){
		10	moneyFormat( this );
		11	});
9	});	12	});
10	//]]>	13
11	</script>
12	<script type= "text/javascript">
13	//<![CDATA[
14	function moneyFormat(textObj) {	14	function moneyFormat(textObj) {
15	var newValue = textObj.value;	15	var newValue = textObj.value;
16	var decAmount = "";	16	var decAmount = "";
Lines 99-105 function moneyFormat(textObj) { Link Here
99	[% END %]	99	[% END %]
100		100
101	[% IF ( pay_individual ) %]	101	[% IF ( pay_individual ) %]
102	<form name="payindivfine" id="payindivfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">	102	<form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
103	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />	103	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
104	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />	104	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
105	<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />	105	<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
Lines 145-151 function moneyFormat(textObj) { Link Here
145	<li>	145	<li>
146	<label for="paid">Collect from patron: </label>	146	<label for="paid">Collect from patron: </label>
147	<!-- default to paying all -->	147	<!-- default to paying all -->
148	<input name="paid" id="paid" value="[% amountoutstanding \| format('%.2f') %]" onchange="moneyFormat(document.payindivfine.paid)"/>	148	<input name="paid" id="paid" value="[% amountoutstanding \| format('%.2f') %]" />
149	</li>	149	</li>
150	</ol>	150	</ol>
151	</fieldset>	151	</fieldset>
Lines 195-201 function moneyFormat(textObj) { Link Here
195	</form>	195	</form>
196	[% ELSE %]	196	[% ELSE %]
197		197
198	<form name="payfine" id="payfine" onsubmit="return validatePayment(this);" method="post" action="/cgi-bin/koha/members/paycollect.pl">	198	<form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
199	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />	199	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
200	<input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />	200	<input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
201	<input type="hidden" name="total" id="total" value="[% total %]" />	201	<input type="hidden" name="total" id="total" value="[% total %]" />
Lines 210-216 function moneyFormat(textObj) { Link Here
210	<li>	210	<li>
211	<label for="paid">Collect from patron: </label>	211	<label for="paid">Collect from patron: </label>
212	<!-- default to paying all -->	212	<!-- default to paying all -->
213	<input name="paid" id="paid" value="[% total \| format('%.2f') %]" onchange="moneyFormat(document.payfine.paid)"/>	213	<input name="paid" id="paid" value="[% total \| format('%.2f') %]" />
214	</li>	214	</li>
215	<li>	215	<li>
216	<label for="selected_accts_notes">Note: </label>	216	<label for="selected_accts_notes">Note: </label>




[% INCLUDE 'doc-head-open.inc' %]
<title>Print Receipt for [% cardnumber %]</title>
[% INCLUDE 'doc-head-close.inc' %]
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
[% INCLUDE 'slip-print.inc' #printThenClose %]
</head>
<body id="pat_printfeercpt" class="pat">

<div id="receipt">
<!-- The table with the account items -->




[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Print receipt for [% cardnumber %]</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
[% INCLUDE 'slip-print.inc' #printThenClose %]
</head>
<body id="printinvoice" class="pat">

<div id="receipt">
<!-- The table with the account items -->
- 

Return to bug 17014

Lines 4-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-4 / +1 lines)
4	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>	5	<title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
6	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]
7	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
8	<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
9	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print.css" />
10	[% INCLUDE 'slip-print.inc' #printThenClose %]	7	[% INCLUDE 'slip-print.inc' #printThenClose %]
11	</head>	8	</head>
12	<body id="pat_moremember-print" class="pat" onload="printThenClose();">	9	<body id="pat_moremember-print" class="pat">
13	<div id="main">	10	<div id="main">
14	<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>	11	<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
15		12

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-5 / +3 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% INCLUDE 'doc-head-open.inc' %]	2	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Print Receipt for [% cardnumber %]</title>	3	<title>Print receipt for [% cardnumber %]</title>
4	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	4	[% INCLUDE 'doc-head-close.inc' %]
5	<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
6	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />	5	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
7	[% INCLUDE 'slip-print.inc' #printThenClose %]	6	[% INCLUDE 'slip-print.inc' #printThenClose %]
8	</head>	7	</head>
9	<body id="printinvoice" class="pat" onload="printThenClose();">	8	<body id="printinvoice" class="pat">
10		9
11	<div id="receipt">	10	<div id="receipt">
12	<!-- The table with the account items -->	11	<!-- The table with the account items -->
13	-