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

(-)a/C4/Letters.pm (+1 lines)
Lines 753-758 sub _parseletter_sth { Link Here
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 = ?" :
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (+7 lines)
Lines 70-75 Link Here
70
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=claimacquisition">Claim acquisition</a></li>
70
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=claimacquisition">Claim acquisition</a></li>
71
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=claimissues">Claim serial issue</a></li>
71
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=claimissues">Claim serial issue</a></li>
72
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=reserves">Holds</a></li>
72
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=reserves">Holds</a></li>
73
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=ill">Interlibrary loans</a></li>
73
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=orderacquisition">Order acquisition</a></li>
74
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=orderacquisition">Order acquisition</a></li>
74
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=members">Patrons</a></li>
75
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=members">Patrons</a></li>
75
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=serial">Serials (new issue)</a></li>
76
                    <li><a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=serial">Serials (new issue)</a></li>
Lines 117-122 Link Here
117
                          [% CASE 'claimacquisition' %]<span>Claim acquisition</span>
118
                          [% CASE 'claimacquisition' %]<span>Claim acquisition</span>
118
                          [% CASE 'claimissues' %]<span>Claim serial issue</span>
119
                          [% CASE 'claimissues' %]<span>Claim serial issue</span>
119
                          [% CASE 'reserves' %]<span>Holds</span>
120
                          [% CASE 'reserves' %]<span>Holds</span>
121
                          [% CASE 'ill' %]<span>Interlibrary loans</span>
120
                          [% CASE 'members' %]<span>Patrons</span>
122
                          [% CASE 'members' %]<span>Patrons</span>
121
                          [% CASE 'serial' %]<span>Serials (new issue)</span>
123
                          [% CASE 'serial' %]<span>Serials (new issue)</span>
122
                          [% CASE 'suggestions' %]<span>Suggestions</span>
124
                          [% CASE 'suggestions' %]<span>Suggestions</span>
Lines 261-266 Link Here
261
                                    [% ELSE %]
263
                                    [% ELSE %]
262
                                      <option value="reserves">Holds</option>
264
                                      <option value="reserves">Holds</option>
263
                                    [% END %]
265
                                    [% END %]
266
                                    [% IF ( module == "ill" ) %]
267
                                      <option value="ill" selected="selected">Interlibrary loans</option>
268
                                    [% ELSE %]
269
                                      <option value="ill">Interlibrary loans</option>
270
                                    [% END %]
264
                                    [% IF ( module == "members" ) %]
271
                                    [% IF ( module == "members" ) %]
265
                                      <option value="members" selected="selected">Patrons</option>
272
                                      <option value="members" selected="selected">Patrons</option>
266
                                    [% ELSE %]
273
                                    [% ELSE %]
(-)a/tools/letter.pl (-1 / +4 lines)
Lines 258-263 sub add_form { Link Here
258
        if ( $module eq 'circulation' and $code and $code =~ /^AR_/  ) {
258
        if ( $module eq 'circulation' and $code and $code =~ /^AR_/  ) {
259
            push @{$field_selection}, add_fields('article_requests');
259
            push @{$field_selection}, add_fields('article_requests');
260
        }
260
        }
261
262
        if ( $module eq 'ill' ) {
263
            push @{$field_selection}, add_fields('illrequests');
264
        }
261
    }
265
    }
262
266
263
    my $preview_is_available = 0;
267
    my $preview_is_available = 0;
264
- 

Return to bug 22818