Auftrags-Controller: Name der Druckvorlage und Download-Datei nicht fest verdrahten.

[mfinanz.git] / SL / Controller / Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 1933827902b73907a583e07ffcff90be38135c34..25eae7a9b62f1b0e5f9dfe3b3dab0e1ffef4130c 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 $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)
@@ -259,9 +261,11 @@ sub action_customer_vendor_changed {
 
   $self->order->taxzone_id($self->order->$cv_method->taxzone_id);
 
-  $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked)
-                            ? $self->order->$cv_method->taxincluded_checked
-                            : $::myconfig{taxincluded_checked});
+  if ($self->order->is_sales) {
+    $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked)
+                              ? $self->order->$cv_method->taxincluded_checked
+                              : $::myconfig{taxincluded_checked});
+  }
 
   $self->_recalc();
 
@@ -449,7 +453,7 @@ sub build_tax_rows {
   my ($self) = @_;
 
   my $rows_as_html;
-  foreach my $tax (@{ $self->{taxes} }) {
+  foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) {
     $rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax, TAXINCLUDED => $self->order->taxincluded);
   }
   return $rows_as_html;
@@ -558,8 +562,8 @@ sub _create_pdf {
   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';