FlattenToForm: $form->{vc} auch für Order setzen.

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 99fe818cc87628d2e2734456e94401e8be62d0c2..9c6a3a8f15493218b164e3333a598a2f6c339647 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -539,7 +539,7 @@ sub footer {
   print $::request->{layout}->post_content;
 
   if (my @inline_scripts = $::request->{layout}->javascripts_inline) {
   print $::request->{layout}->post_content;
 
   if (my @inline_scripts = $::request->{layout}->javascripts_inline) {

-    print "<script type='text/javascript'>@inline_scripts</script>\n";
+    print "<script type='text/javascript'>" . join("; ", @inline_scripts) . "</script>\n";

   }
 
   print <<EOL
   }
 
   print <<EOL


@@ -1301,6 +1301,9 @@ sub generate_attachment_filename {
   } elsif ($attachment_filename && $self->{"${prefix}number"}) {
     $attachment_filename .=  "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
 
   } elsif ($attachment_filename && $self->{"${prefix}number"}) {
     $attachment_filename .=  "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
 

+  } elsif ($attachment_filename) {
+    $attachment_filename .=  $self->get_extension_for_format();
+

   } else {
     $attachment_filename = "";
   }
   } else {
     $attachment_filename = "";
   }


@@ -3474,9 +3477,9 @@ sub calculate_arap {
     if ( $selected_tax ) {
 
       if ( $buysell eq 'sell' ) {
     if ( $selected_tax ) {
 
       if ( $buysell eq 'sell' ) {

-        $self->{AR_amounts}{"tax_$i"} = $selected_tax->chart->accno unless $selected_tax->taxkey == 0;
+        $self->{AR_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;

       } else {
       } else {

-        $self->{AP_amounts}{"tax_$i"} = $selected_tax->chart->accno unless $selected_tax->taxkey == 0;
+        $self->{AP_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;

       };
 
       $self->{"taxkey_$i"} = $selected_tax->taxkey;
       };
 
       $self->{"taxkey_$i"} = $selected_tax->taxkey;