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:
3b8f669
)
Auftrags-Controller: Name der Druckvorlage und Download-Datei nicht fest verdrahten.
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Mon, 12 Oct 2015 21:24:12 +0000
(23:24 +0200)
committer
G. Richardson
<information@kivitendo-premium.de>
Mon, 16 Nov 2015 15:15:58 +0000
(16:15 +0100)
SL/Controller/Order.pm
patch
|
blob
|
history
diff --git
a/SL/Controller/Order.pm
b/SL/Controller/Order.pm
index
ee00b15
..
25eae7a
100644
(file)
--- a/
SL/Controller/Order.pm
+++ b/
SL/Controller/Order.pm
@@
-124,7
+124,9
@@
sub action_create_pdf {
my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000);
$::auth->set_session_value("Order::create_pdf-${key}" => $sfile->file_name);
my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000);
$::auth->set_session_value("Order::create_pdf-${key}" => $sfile->file_name);
- my $pdf_filename = t8('Sales Order') . '_' . $self->order->ordnumber . '.pdf';
+ $::form->{formname} = $self->type;
+ $::form->{language} = 'de';
+ my $pdf_filename = $::form->get_formname_translation . '_' . $self->order->ordnumber . '.pdf';
$self->js
->run('download_pdf', $pdf_filename, $key)
$self->js
->run('download_pdf', $pdf_filename, $key)
@@
-560,8
+562,8
@@
sub _create_pdf {
my ($order, $pdf_ref, $params) = @_;
my $print_form = Form->new('');
my ($order, $pdf_ref, $params) = @_;
my $print_form = Form->new('');
- $print_form->{type} =
'sales_order'
;
- $print_form->{formname} =
'sales_order',
+ $print_form->{type} =
$order->type
;
+ $print_form->{formname} =
$order->type;
$print_form->{format} = $params->{format} || 'pdf',
$print_form->{media} = $params->{media} || 'file';
$print_form->{format} = $params->{format} || 'pdf',
$print_form->{media} = $params->{media} || 'file';