Attachment #100235 for bug #22818

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

Lines 753-758 sub _parseletter_sth { Link Here

(-)a/C4/Letters.pm (+1 lines)
753	($table eq 'suggestions' ) ? "SELECT * FROM $table WHERE suggestionid = ?" :	753	($table eq 'suggestions' ) ? "SELECT * FROM $table WHERE suggestionid = ?" :
754	($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE id = ?" :	754	($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE id = ?" :
755	($table eq 'aqorders' ) ? "SELECT * FROM $table WHERE ordernumber = ?" :	755	($table eq 'aqorders' ) ? "SELECT * FROM $table WHERE ordernumber = ?" :
		756	($table eq 'illrequests' ) ? "SELECT * FROM $table WHERE illrequest_id = ?" :
756	($table eq 'opac_news' ) ? "SELECT * FROM $table WHERE idnew = ?" :	757	($table eq 'opac_news' ) ? "SELECT * FROM $table WHERE idnew = ?" :
757	($table eq 'article_requests') ? "SELECT * FROM $table WHERE id = ?" :	758	($table eq 'article_requests') ? "SELECT * FROM $table WHERE id = ?" :
758	($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :	759	($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :

Lines 111-116 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (+7 lines)
111	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=claimacquisition">Claim acquisition</a></li>	111	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=claimacquisition">Claim acquisition</a></li>
112	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=claimissues">Claim serial issue</a></li>	112	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=claimissues">Claim serial issue</a></li>
113	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=reserves">Holds</a></li>	113	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=reserves">Holds</a></li>
		114	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=ill">Interlibrary loans</a></li>
114	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=orderacquisition">Order acquisition</a></li>	115	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=orderacquisition">Order acquisition</a></li>
115	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=members">Patrons</a></li>	116	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=members">Patrons</a></li>
116	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=serial">Serials (new issue)</a></li>	117	<li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&module=serial">Serials (new issue)</a></li>
Lines 166-171 Link Here
166	[% CASE 'claimacquisition' %]<span>Claim acquisition</span>	167	[% CASE 'claimacquisition' %]<span>Claim acquisition</span>
167	[% CASE 'claimissues' %]<span>Claim serial issue</span>	168	[% CASE 'claimissues' %]<span>Claim serial issue</span>
168	[% CASE 'reserves' %]<span>Holds</span>	169	[% CASE 'reserves' %]<span>Holds</span>
		170	[% CASE 'reserves' %]<span>Interlibrary loans</span>
169	[% CASE 'members' %]<span>Patrons</span>	171	[% CASE 'members' %]<span>Patrons</span>
170	[% CASE 'serial' %]<span>Serials (new issue)</span>	172	[% CASE 'serial' %]<span>Serials (new issue)</span>
171	[% CASE 'suggestions' %]<span>Suggestions</span>	173	[% CASE 'suggestions' %]<span>Suggestions</span>
Lines 313-318 Link Here
313	[% ELSE %]	315	[% ELSE %]
314	<option value="reserves">Holds</option>	316	<option value="reserves">Holds</option>
315	[% END %]	317	[% END %]
		318	[% IF ( module == "ill" ) %]
		319	<option value="ill" selected="selected">Interlibrary loans</option>
		320	[% ELSE %]
		321	<option value="ill">Interlibrary loans</option>
		322	[% END %]
316	[% IF ( module == "members" ) %]	323	[% IF ( module == "members" ) %]
317	<option value="members" selected="selected">Patrons</option>	324	<option value="members" selected="selected">Patrons</option>
318	[% ELSE %]	325	[% ELSE %]

Lines 261-266 sub add_form { Link Here

(-)a/tools/letter.pl (-1 / +4 lines)
261	if ( $module eq 'circulation' and $code and $code =~ /^AR_/ ) {	261	if ( $module eq 'circulation' and $code and $code =~ /^AR_/ ) {
262	push @{$field_selection}, add_fields('article_requests');	262	push @{$field_selection}, add_fields('article_requests');
263	}	263	}
		264
		265	if ( $module eq 'ill' ) {
		266	push @{$field_selection}, add_fields('illrequests');
		267	}
264	}	268	}
265		269
266	my $preview_is_available = 0;	270	my $preview_is_available = 0;
267	-

Return to bug 22818