@@ -, +, @@ framework --- admin/import_export_framework.pl | 6 +----- .../prog/en/modules/admin/biblio_framework.tt | 16 +++++++--------- 2 files changed, 8 insertions(+), 14 deletions(-) --- a/admin/import_export_framework.pl +++ a/admin/import_export_framework.pl @@ -62,10 +62,6 @@ if ($action eq 'export' && $input->request_method() eq 'GET') { binmode(STDOUT,':encoding(UTF-8)'); print $input->header(-type => 'application/vnd.ms-excel', -attachment => 'export_' . $framework_name . '.csv'); print $strXml; - } elsif ($format eq 'excel') { - # Excel-xml file - print $input->header(-type => 'application/excel', -attachment => 'export_' . $framework_name . '.xml'); - print $strXml; } else { # ODS file my $strODS = ''; @@ -79,7 +75,7 @@ if ($action eq 'export' && $input->request_method() eq 'GET') { my $fieldname = 'file_import_' . $framework_name; my $filename = $input->param($fieldname); # upload the input file - if ($filename && $filename =~ /\.(csv|ods|xml)$/i) { + if ($filename && $filename =~ /\.(csv|ods)$/i) { my $extension = $1; my $uploadFd = $input->upload($fieldname); if ($uploadFd && !$input->cgi_error) { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -141,9 +141,9 @@ @@ -177,7 +176,7 @@