projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SimpleSystemSetting: Umstellung von »Abteilungen«
[kivitendo-erp.git]
/
SL
/
Controller
/
Letter.pm
diff --git
a/SL/Controller/Letter.pm
b/SL/Controller/Letter.pm
index
2495b47
..
cfc1f68
100644
(file)
--- 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::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::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;
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};
$::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',
$::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;
}
$letter;
}
@@
-613,7
+616,7
@@
sub init_webdav_objects {
return [ map {
+{ name => $_->filename,
type => t8('File'),
return [ map {
+{ name => $_->filename,
type => t8('File'),
- link => File::Spec->cat
dir($webdav_path, $_->filename
),
+ link => File::Spec->cat
file($_->full_filedescriptor
),
}
} @all_objects ];
}
}
} @all_objects ];
}