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

(-)a/C4/Letters.pm (-2 / +1 lines)
Lines 483-493 sub parseletter_sth { Link Here
483
    ($table eq 'biblio'       ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
483
    ($table eq 'biblio'       ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
484
    ($table eq 'biblioitems'  ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
484
    ($table eq 'biblioitems'  ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
485
    ($table eq 'items'        ) ? "SELECT * FROM $table WHERE     itemnumber = ?"                      :
485
    ($table eq 'items'        ) ? "SELECT * FROM $table WHERE     itemnumber = ?"                      :
486
    ($table eq 'suggestions'  ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" :
487
    ($table eq 'reserves'     ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" :
486
    ($table eq 'reserves'     ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" :
488
    ($table eq 'borrowers'    ) ? "SELECT * FROM $table WHERE borrowernumber = ?"                      :
487
    ($table eq 'borrowers'    ) ? "SELECT * FROM $table WHERE borrowernumber = ?"                      :
489
    ($table eq 'branches'     ) ? "SELECT * FROM $table WHERE     branchcode = ?"                      :
488
    ($table eq 'branches'     ) ? "SELECT * FROM $table WHERE     branchcode = ?"                      :
490
    ($table eq 'suggestions'  ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" :
489
    ($table eq 'suggestions'  ) ? "SELECT * FROM $table WHERE   suggestionid = ?"                      :
491
    ($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE             id = ?"                      : undef ;
490
    ($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE             id = ?"                      : undef ;
492
    unless ($query) {
491
    unless ($query) {
493
        warn "ERROR: No parseletter_sth query for table '$table'";
492
        warn "ERROR: No parseletter_sth query for table '$table'";
(-)a/C4/Suggestions.pm (-4 / +7 lines)
Lines 379-396 Note that there is no function to modify a suggestion. Link Here
379
sub ModSuggestion {
379
sub ModSuggestion {
380
    my ($suggestion)=@_;
380
    my ($suggestion)=@_;
381
    my $status_update_table=UpdateInTable("suggestions", $suggestion);
381
    my $status_update_table=UpdateInTable("suggestions", $suggestion);
382
    # check mail sending.
382
# check mail sending.
383
    if ($$suggestion{STATUS}){
383
    if ($$suggestion{STATUS}){
384
        my $letter=C4::Letters::getletter('suggestions',$suggestion->{STATUS});
384
        my $letter=C4::Letters::getletter('suggestions',$suggestion->{STATUS});
385
        if ($letter){
385
        if ($letter){
386
        my $enqueued = C4::Letters::EnqueueLetter({
386
            C4::Letters::parseletter($letter, 'borrowers', $suggestion->{suggestedby});
387
            C4::Letters::parseletter($letter, 'suggestions', $suggestion->{suggestionid});
388
            C4::Letters::parseletter($letter, 'biblio', $suggestion->{biblionumber});
389
            my $enqueued = C4::Letters::EnqueueLetter({
387
            letter=>$letter,
390
            letter=>$letter,
388
            borrowernumber=>$suggestion->{suggestedby},
391
            borrowernumber=>$suggestion->{suggestedby},
389
            suggestionid=>$suggestion->{suggestionid},
392
            suggestionid=>$suggestion->{suggestionid},
390
            LibraryName => C4::Context->preference("LibraryName"),
393
            LibraryName => C4::Context->preference("LibraryName"),
391
            msg_transport_type=>'email'
394
            message_transport_type=>'email'
392
            });
395
            });
393
        if (!$enqueued){warn "can't enqueue letter $letter";}
396
            if (!$enqueued){warn "can't enqueue letter $letter";}
394
        }
397
        }
395
    }
398
    }
396
    return $status_update_table;
399
    return $status_update_table;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl (-10 / +14 lines)
Lines 190-199 $(document).ready(function() { Link Here
190
                                    <!--TMPL_ELSE-->
190
                                    <!--TMPL_ELSE-->
191
                                    <option value="catalogue" >Catalog</option>
191
                                    <option value="catalogue" >Catalog</option>
192
                                    <!--/TMPL_IF-->
192
                                    <!--/TMPL_IF-->
193
                                    <!--TMPL_IF Name="serial"-->
193
                                    <!--TMPL_IF Name="circulation"-->
194
                                    <option value="serial" selected="selected">Serials (Routing List)</option>
194
                                    <option value="circulation" selected="selected">Circulation</option>
195
                                    <!--TMPL_ELSE-->
195
                                    <!--TMPL_ELSE-->
196
                                    <option value="serial">Serials (Routing List)</option>
196
                                    <option value="circulation">Circulation</option>
197
                                    <!--/TMPL_IF-->
197
                                    <!--/TMPL_IF-->
198
                                    <!--TMPL_IF Name="claimacquisition"-->
198
                                    <!--TMPL_IF Name="claimacquisition"-->
199
                                    <option value="claimacquisition" selected="selected">Claim Acquisition</option>
199
                                    <option value="claimacquisition" selected="selected">Claim Acquisition</option>
Lines 205-224 $(document).ready(function() { Link Here
205
                                    <!--TMPL_ELSE-->
205
                                    <!--TMPL_ELSE-->
206
                                    <option value="claimissues">Claim Serial Issue</option>
206
                                    <option value="claimissues">Claim Serial Issue</option>
207
                                    <!--/TMPL_IF-->
207
                                    <!--/TMPL_IF-->
208
                                    <!--TMPL_IF Name="circulation"-->
208
                                    <!--TMPL_IF Name="reserves"-->
209
                                    <option value="circulation" selected="selected">Circulation</option>
209
                                    <option value="reserves" selected="selected">Holds</option>
210
                                    <!--TMPL_ELSE-->
210
                                    <!--TMPL_ELSE-->
211
                                    <option value="circulation">Circulation</option>
211
                                    <option value="reserves">Holds</option>
212
                                    <!--/TMPL_IF-->
212
                                    <!--/TMPL_IF-->
213
                                    <!--TMPL_IF Name="members"-->
213
                                    <!--TMPL_IF Name="members"-->
214
                                    <option value="members" selected="selected">Members</option>
214
                                    <option value="members" selected="selected">Members</option>
215
                                    <!--TMPL_ELSE-->
215
                                    <!--TMPL_ELSE-->
216
                                    <option value="members">Members</option>
216
                                    <option value="members">Members</option>
217
                                    <!--/TMPL_IF-->
217
                                    <!--/TMPL_IF-->
218
                                    <!--TMPL_IF Name="reserves"-->
218
                                    <!--TMPL_IF Name="serial"-->
219
                                    <option value="reserves" selected="selected">Holds</option>
219
                                    <option value="serial" selected="selected">Serials (Routing List)</option>
220
                                    <!--TMPL_ELSE-->
220
                                    <!--TMPL_ELSE-->
221
                                    <option value="reserves">Holds</option>
221
                                    <option value="serial">Serials (Routing List)</option>
222
                                    <!--/TMPL_IF-->
223
                                    <!--TMPL_IF Name="suggestions"-->
224
                                    <option value="suggestions" selected="selected">Suggestions</option>
225
                                    <!--TMPL_ELSE-->
226
                                    <option value="suggestions">Suggestions</option>
222
                                    <!--/TMPL_IF-->
227
                                    <!--/TMPL_IF-->
223
				</select>
228
				</select>
224
			</li>
229
			</li>
225
- 

Return to bug 4211