@@ -, +, @@ leave 'Library' and 'Koha module' options as default selections. Enter 'KOHA_14206' and 'Koha Test 14206' against Code and Name respectively, and 'Test' and 'Test Message' for subject and body. Leave the Email, Phone and SMS tabs blank. Save the notice. delete it. It will load the 'Delete notice' dialog form, but the table will not show any data under s - 'Library', 'Module', 'Code' or 'Name'. Notices listing reloaded. The print-only KOHA_14206 notice should continue to exist. This is *wrong*. KOHA_14206. This time, it should show the data under 'Module', 'Code' or 'Name' at least. reload. This time KOHA_14206 will be gone. to check actual deletion from the database. No record should be returned. email, phone and sms delivery options. be shown in the listing. Confirm deletion by running step #7. No record should be returned. --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- tools/letter.pl | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -231,7 +231,7 @@ $(document).ready(function() { [% IF !lette.protected && can_edit %] - Delete + Delete [% END %] @@ -444,7 +444,7 @@ $(document).ready(function() { - [% Branches.GetName( letter.branchcode ) %] + [% IF letter.branchcode %][% Branches.GetName( letter.branchcode ) %][% ELSE %](All libraries)[% END %] [% letter.module %] [% letter.code %] [% letter.name %] --- a/tools/letter.pl +++ a/tools/letter.pl @@ -66,6 +66,7 @@ my $code = $input->param('code'); my $module = $input->param('module') || ''; my $content = $input->param('content'); my $op = $input->param('op') || ''; +my $mtt = $input->param('mtt') || ''; my $dbh = C4::Context->dbh; our ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user( @@ -112,7 +113,7 @@ elsif ( $op eq 'add_form' ) { add_form($branchcode, $module, $code); } elsif ( $op eq 'delete_confirm' ) { - delete_confirm($branchcode, $module, $code); + delete_confirm($branchcode, $module, $code, $mtt); } elsif ( $op eq 'delete_confirmed' ) { delete_confirmed($branchcode, $module, $code); @@ -293,9 +294,9 @@ sub add_validate { } sub delete_confirm { - my ($branchcode, $module, $code) = @_; + my ($branchcode, $module, $code, $mtt) = @_; my $dbh = C4::Context->dbh; - my $letter = C4::Letters::getletter($module, $code, $branchcode); + my $letter = C4::Letters::getletter($module, $code, $branchcode, $mtt); my @values = values %$letter; $template->param( letter => $letter, @@ -325,7 +326,7 @@ sub retrieve_letters { my $dbh = C4::Context->dbh; my ($sql, @where, @args); - $sql = "SELECT branchcode, module, code, name, branchname + $sql = "SELECT branchcode, module, code, name, branchname, message_transport_type FROM letter LEFT OUTER JOIN branches USING (branchcode) "; --