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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-2 / +2 lines)
Lines 231-237 $(document).ready(function() { Link Here
231
                  </td>
231
                  </td>
232
                  <td>
232
                  <td>
233
                    [% IF !lette.protected && can_edit %]
233
                    [% IF !lette.protected && can_edit %]
234
                      <a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;branchcode=[%lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Delete</a>
234
                      <a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;branchcode=[%lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]&amp;mtt=[% lette.message_transport_type %]">Delete</a>
235
                    [% END %]
235
                    [% END %]
236
                  </td>
236
                  </td>
237
                </tr>
237
                </tr>
Lines 444-450 $(document).ready(function() { Link Here
444
            </tr>
444
            </tr>
445
            </thead>
445
            </thead>
446
            <tr>
446
            <tr>
447
                <td>[% Branches.GetName( letter.branchcode ) %]</td>
447
                <td>[% IF letter.branchcode %][% Branches.GetName( letter.branchcode ) %][% ELSE %](All libraries)[% END %]</td>
448
                <td>[% letter.module %]</td>
448
                <td>[% letter.module %]</td>
449
                <td>[% letter.code %]</td>
449
                <td>[% letter.code %]</td>
450
                <td>[% letter.name %]</td>
450
                <td>[% letter.name %]</td>
(-)a/tools/letter.pl (-5 / +5 lines)
Lines 66-71 my $code = $input->param('code'); Link Here
66
my $module      = $input->param('module') || '';
66
my $module      = $input->param('module') || '';
67
my $content     = $input->param('content');
67
my $content     = $input->param('content');
68
my $op          = $input->param('op') || '';
68
my $op          = $input->param('op') || '';
69
my $mtt         = $input->param('mtt') || '';
69
my $dbh = C4::Context->dbh;
70
my $dbh = C4::Context->dbh;
70
71
71
our ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
72
our ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
Lines 112-118 elsif ( $op eq 'add_form' ) { Link Here
112
    add_form($branchcode, $module, $code);
113
    add_form($branchcode, $module, $code);
113
}
114
}
114
elsif ( $op eq 'delete_confirm' ) {
115
elsif ( $op eq 'delete_confirm' ) {
115
    delete_confirm($branchcode, $module, $code);
116
    delete_confirm($branchcode, $module, $code, $mtt);
116
}
117
}
117
elsif ( $op eq 'delete_confirmed' ) {
118
elsif ( $op eq 'delete_confirmed' ) {
118
    delete_confirmed($branchcode, $module, $code);
119
    delete_confirmed($branchcode, $module, $code);
Lines 293-301 sub add_validate { Link Here
293
}
294
}
294
295
295
sub delete_confirm {
296
sub delete_confirm {
296
    my ($branchcode, $module, $code) = @_;
297
    my ($branchcode, $module, $code, $mtt) = @_;
297
    my $dbh = C4::Context->dbh;
298
    my $dbh = C4::Context->dbh;
298
    my $letter = C4::Letters::getletter($module, $code, $branchcode);
299
    my $letter = C4::Letters::getletter($module, $code, $branchcode, $mtt);
299
    my @values = values %$letter;
300
    my @values = values %$letter;
300
    $template->param(
301
    $template->param(
301
        letter => $letter,
302
        letter => $letter,
Lines 325-331 sub retrieve_letters { Link Here
325
326
326
    my $dbh = C4::Context->dbh;
327
    my $dbh = C4::Context->dbh;
327
    my ($sql, @where, @args);
328
    my ($sql, @where, @args);
328
    $sql = "SELECT branchcode, module, code, name, branchname
329
    $sql = "SELECT branchcode, module, code, name, branchname, message_transport_type
329
            FROM letter
330
            FROM letter
330
            LEFT OUTER JOIN branches USING (branchcode)
331
            LEFT OUTER JOIN branches USING (branchcode)
331
    ";
332
    ";
332
- 

Return to bug 14206