From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 8 Aug 2016 12:07:35 +0000 (+0200)
Subject: Briefe: Sprache im Druck
X-Git-Tag: release-3.5.4~2143
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=762f348476e09df5619fa11d7ec070209cb843f4;p=kivitendo-erp.git

Briefe: Sprache im Druck
---

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 2495b4717..3d704b8de 100644
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -9,9 +9,11 @@ use POSIX qw(strftime);
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
 use SL::CT;
+use SL::DB::Employee;
+use SL::DB::Language;
 use SL::DB::Letter;
 use SL::DB::LetterDraft;
-use SL::DB::Employee;
+use SL::DB::Printer;
 use SL::Helper::Flash qw(flash flash_later);
 use SL::Helper::CreatePDF;
 use SL::Helper::PrintOptions;
@@ -359,6 +361,7 @@ sub _display {
   $::request->layout->add_javascripts('edit_part_window.js');
 
   $::form->{language_id} ||= $params{language_id};
+  $::form->{languages}   ||= SL::DB::Manager::Language->get_all_sorted;
   $::form->{printers}      = SL::DB::Manager::Printer->get_all_sorted;
 
   $self->render('letter/edit',
diff --git a/SL/Helper/PrintOptions.pm b/SL/Helper/PrintOptions.pm
index da6cdf313..7569ea687 100644
--- a/SL/Helper/PrintOptions.pm
+++ b/SL/Helper/PrintOptions.pm
@@ -67,6 +67,9 @@ sub get_print_options {
     ($form->{type} =~ /_delivery_order$/) ? (
       opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
       opthash('pick_list',           $form->{PD}{pick_list},           $locale->text('Pick List')),
+    ) : undef,
+    ($form->{type} =~ /^letter$/) ? (
+      opthash('letter',              $form->{PD}{letter},              $locale->text('Letter')),
     ) : undef;
 
   push @SENDMODE,
@@ -122,7 +125,6 @@ sub get_print_options {
 
   my %dont_display_groupitems = (
     'dunning' => 1,
-    'letter'  => 1,
     );
 
   my %template_vars = (