X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FLetter.pm;h=cfc1f6867176bca26cb973e0cae59ec499d7dcae;hb=9380035c08379c1ad6d07e9d51e24c16cbea84f2;hp=2495b4717fbf33e9a6a2aa3ea32547929416b9a2;hpb=db7a2e79d8f43e94709f9fe56d30d8cda23e856a;p=kivitendo-erp.git diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm index 2495b4717..cfc1f6867 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', @@ -574,7 +577,7 @@ sub init_letter { # )); } - $self->is_sales($letter->is_sales); + $self->is_sales($letter->is_sales) if $letter->id; $letter; } @@ -613,7 +616,7 @@ sub init_webdav_objects { return [ map { +{ name => $_->filename, type => t8('File'), - link => File::Spec->catdir($webdav_path, $_->filename), + link => File::Spec->catfile($_->full_filedescriptor), } } @all_objects ]; }