Attachment #113399 for bug #22818

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

Lines 775-780 sub _parseletter_sth { Link Here

(-)a/C4/Letters.pm (+1 lines)
775	($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE id = ?" :	775	($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE id = ?" :
776	($table eq 'aqorders' ) ? "SELECT * FROM $table WHERE ordernumber = ?" :	776	($table eq 'aqorders' ) ? "SELECT * FROM $table WHERE ordernumber = ?" :
777	($table eq 'aqbasket' ) ? "SELECT * FROM $table WHERE basketno = ?" :	777	($table eq 'aqbasket' ) ? "SELECT * FROM $table WHERE basketno = ?" :
		778	($table eq 'illrequests' ) ? "SELECT * FROM $table WHERE illrequest_id = ?" :
778	($table eq 'opac_news' ) ? "SELECT * FROM $table WHERE idnew = ?" :	779	($table eq 'opac_news' ) ? "SELECT * FROM $table WHERE idnew = ?" :
779	($table eq 'article_requests') ? "SELECT * FROM $table WHERE id = ?" :	780	($table eq 'article_requests') ? "SELECT * FROM $table WHERE id = ?" :
780	($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :	781	($table eq 'borrower_modifications') ? "SELECT * FROM $table WHERE verification_token = ?" :

Lines 112-117 Link Here

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

Lines 265-270 sub add_form { Link Here

(-)a/tools/letter.pl (-1 / +4 lines)
265	if ( $module eq 'members' and $code and $code eq 'PROBLEM_REPORT' ) {	265	if ( $module eq 'members' and $code and $code eq 'PROBLEM_REPORT' ) {
266	push @{$field_selection}, add_fields('problem_reports');	266	push @{$field_selection}, add_fields('problem_reports');
267	}	267	}
		268
		269	if ( $module eq 'ill' ) {
		270	push @{$field_selection}, add_fields('illrequests');
		271	}
268	}	272	}
269		273
270	my $preview_is_available = 0;	274	my $preview_is_available = 0;
271	-

Return to bug 22818