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

(-)a/C4/Letters.pm (+2 lines)
Lines 489-494 sub parseletter_sth { Link Here
489
    ($table eq 'biblio'       ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
489
    ($table eq 'biblio'       ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
490
    ($table eq 'biblioitems'  ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
490
    ($table eq 'biblioitems'  ) ? "SELECT * FROM $table WHERE   biblionumber = ?"                      :
491
    ($table eq 'items'        ) ? "SELECT * FROM $table WHERE     itemnumber = ?"                      :
491
    ($table eq 'items'        ) ? "SELECT * FROM $table WHERE     itemnumber = ?"                      :
492
    ($table eq 'issues'       ) ? "SELECT * FROM $table WHERE     itemnumber = ?"                      :
493
    ($table eq 'suggestions'  ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" :
492
    ($table eq 'reserves'     ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" :
494
    ($table eq 'reserves'     ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" :
493
    ($table eq 'borrowers'    ) ? "SELECT * FROM $table WHERE borrowernumber = ?"                      :
495
    ($table eq 'borrowers'    ) ? "SELECT * FROM $table WHERE borrowernumber = ?"                      :
494
    ($table eq 'branches'     ) ? "SELECT * FROM $table WHERE     branchcode = ?"                      :
496
    ($table eq 'branches'     ) ? "SELECT * FROM $table WHERE     branchcode = ?"                      :
(-)a/misc/cronjobs/advance_notices.pl (-1 / +6 lines)
Lines 170-175 UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { Link Here
170
                                      borrowernumber => $upcoming->{'borrowernumber'},
170
                                      borrowernumber => $upcoming->{'borrowernumber'},
171
                                      branchcode     => $upcoming->{'branchcode'},
171
                                      branchcode     => $upcoming->{'branchcode'},
172
                                      biblionumber   => $biblio->{'biblionumber'},
172
                                      biblionumber   => $biblio->{'biblionumber'},
173
                                      itemnumber     => $upcoming->{'itemnumber'},
173
                                      substitute     => { 'items.content' => $titles }
174
                                      substitute     => { 'items.content' => $titles }
174
                                    } );
175
                                    } );
175
        }
176
        }
Lines 201-206 UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { Link Here
201
                                      borrowernumber => $upcoming->{'borrowernumber'},
202
                                      borrowernumber => $upcoming->{'borrowernumber'},
202
                                      branchcode     => $upcoming->{'branchcode'},
203
                                      branchcode     => $upcoming->{'branchcode'},
203
                                      biblionumber   => $biblio->{'biblionumber'},
204
                                      biblionumber   => $biblio->{'biblionumber'},
205
                                      itemnumber     => $upcoming->{'itemnumber'},
204
                                      substitute     => { 'items.content' => $titles }
206
                                      substitute     => { 'items.content' => $titles }
205
                                    } );
207
                                    } );
206
        }
208
        }
Lines 345-354 sub parse_letter { Link Here
345
    if ( $params->{'branchcode'} ) {
347
    if ( $params->{'branchcode'} ) {
346
        C4::Letters::parseletter( $params->{'letter'}, 'branches',    $params->{'branchcode'} );
348
        C4::Letters::parseletter( $params->{'letter'}, 'branches',    $params->{'branchcode'} );
347
    }
349
    }
348
    
350
    if ( $params->{'itemnumber'} ) {
351
        C4::Letters::parseletter( $params->{'letter'}, 'issues', $params->{'itemnumber'} );
352
    }
349
    if ( $params->{'biblionumber'} ) {
353
    if ( $params->{'biblionumber'} ) {
350
        C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $params->{'biblionumber'} );
354
        C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $params->{'biblionumber'} );
351
        C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $params->{'biblionumber'} );
355
        C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $params->{'biblionumber'} );
356
        C4::Letters::parseletter( $params->{'letter'}, 'items', $params->{'biblionumber'} );
352
    }
357
    }
353
358
354
    return $params->{'letter'};
359
    return $params->{'letter'};
(-)a/tools/letter.pl (-2 / +2 lines)
Lines 172-178 sub add_form { Link Here
172
        push @{$field_selection}, add_fields('biblio','biblioitems'),
172
        push @{$field_selection}, add_fields('biblio','biblioitems'),
173
            {value => q{},             text => '---ITEMS---'  },
173
            {value => q{},             text => '---ITEMS---'  },
174
            {value => 'items.content', text => 'items.content'},
174
            {value => 'items.content', text => 'items.content'},
175
            add_fields('borrowers');
175
            add_fields('issues','borrowers');
176
    }
176
    }
177
177
178
    $template->param(
178
    $template->param(
Lines 309-314 sub get_columns_for { Link Here
309
    my $table_prefix = $table . q|.|;
309
    my $table_prefix = $table . q|.|;
310
    my $rows = C4::Context->dbh->selectall_arrayref($sql, { Slice => {} });
310
    my $rows = C4::Context->dbh->selectall_arrayref($sql, { Slice => {} });
311
    for my $row (@{$rows}) {
311
    for my $row (@{$rows}) {
312
        next if $row->{'Field'} eq 'timestamp'; # this is really an irrelevant field and there may be other common fields that should be excluded from the list
312
        push @fields, {
313
        push @fields, {
313
            value => $table_prefix . $row->{Field},
314
            value => $table_prefix . $row->{Field},
314
            text  => $table_prefix . $row->{Field},
315
            text  => $table_prefix . $row->{Field},
315
- 

Return to bug 5263