projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2459db3
)
Letter: Fehler beim Druck
author
Sven Schöling
<s.schoeling@linet-services.de>
Tue, 2 Feb 2016 10:15:27 +0000
(11:15 +0100)
committer
Sven Schöling
<s.schoeling@linet-services.de>
Tue, 2 Feb 2016 10:27:08 +0000
(11:27 +0100)
SL/Controller/Letter.pm
patch
|
blob
|
history
diff --git
a/SL/Controller/Letter.pm
b/SL/Controller/Letter.pm
index
0f1a40f
..
6509742
100644
(file)
--- a/
SL/Controller/Letter.pm
+++ b/
SL/Controller/Letter.pm
@@
-174,12
+174,14
@@
sub action_print_letter {
$self->export_letter_to_form($letter);
$::form->{formname} = "letter";
$self->export_letter_to_form($letter);
$::form->{formname} = "letter";
- $::form->{format} = "pdf";
+ $::form->{type} = "letter";
+ $::form->{format} = "pdf";
my $language_saved = $::form->{language_id};
my $greeting_saved = $::form->{greeting};
my $cp_id_saved = $::form->{cp_id};
my $language_saved = $::form->{language_id};
my $greeting_saved = $::form->{greeting};
my $cp_id_saved = $::form->{cp_id};
+ $::form->{customer_id} = $self->letter->vc_id;
IS->customer_details(\%::myconfig, $::form);
if (!$cp_id_saved) {
IS->customer_details(\%::myconfig, $::form);
if (!$cp_id_saved) {
@@
-245,6
+247,7
@@
sub action_print_letter {
my $file = IO::File->new($pdf_file_name, 'r') || croak("Cannot open file '$pdf_file_name'");
my $size = -s $pdf_file_name;
my $content_type = 'application/pdf';
my $file = IO::File->new($pdf_file_name, 'r') || croak("Cannot open file '$pdf_file_name'");
my $size = -s $pdf_file_name;
my $content_type = 'application/pdf';
+ $::form->{letternumber} = $self->letter->letternumber;
my $attachment_name = $::form->generate_attachment_filename;
$attachment_name =~ s:.*//::g;
my $attachment_name = $::form->generate_attachment_filename;
$attachment_name =~ s:.*//::g;