projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
S:C:Letter: kivi.SalesPurchase.js laden
[kivitendo-erp.git]
/
SL
/
Controller
/
Letter.pm
diff --git
a/SL/Controller/Letter.pm
b/SL/Controller/Letter.pm
index
2c93480
..
a0aab51
100644
(file)
--- a/
SL/Controller/Letter.pm
+++ b/
SL/Controller/Letter.pm
@@
-151,7
+151,7
@@
sub action_delete {
my ($self, %params) = @_;
if (!$self->letter->delete) {
my ($self, %params) = @_;
if (!$self->letter->delete) {
- flash('error', t8('An error occured. Letter could not be deleted.'));
+ flash('error', t8('An error occur
r
ed. Letter could not be deleted.'));
return $self->action_update;
}
return $self->action_update;
}
@@
-208,7
+208,7
@@
sub action_print_letter {
letter => $letter,
template_meta => {
formname => 'letter',
letter => $letter,
template_meta => {
formname => 'letter',
- language => SL::DB::
Language->new
,
+ language => SL::DB::
Manager::Language->find_by_or_create(id => $::form->{language_id}*1)
,
extension => 'pdf',
format => $::form->{format},
media => $::form->{media},
extension => 'pdf',
format => $::form->{format},
media => $::form->{media},
@@
-314,7
+314,7
@@
sub action_send_email {
sub _display {
my ($self, %params) = @_;
sub _display {
my ($self, %params) = @_;
- $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.Letter);
+ $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.Letter
kivi.SalesPurchase
);
my $letter = $self->letter;
my $letter = $self->letter;