X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=df8bf23e510f5414a6baf0ffcf5309919264e54f;hb=6de8e1614fb03b63967d06bd8522b4b46260832e;hp=70f56f92557650dd3704c42360c204625f139dab;hpb=45970e731c7e0c8a3d469a1c344af20c18987c20;p=kivitendo-erp.git

diff --git a/SL/AM.pm b/SL/AM.pm
index 70f56f925..df8bf23e5 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -210,7 +210,14 @@ sub save_account {
   # sanity check, can't have AR with AR_...
   if ($form->{AR} || $form->{AP} || $form->{IC}) {
     map { delete $form->{$_} }
-      qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice CT_tax);
+      qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice);
+  }
+
+  if ($form->{AR_include_in_dropdown}) {
+    $form->{$form->{AR_include_in_dropdown}} = $form->{AR_include_in_dropdown};
+  }
+  if ($form->{AP_include_in_dropdown}) {
+    $form->{$form->{AP_include_in_dropdown}} = $form->{AP_include_in_dropdown};
   }
 
   $form->{link} = "";
@@ -221,7 +228,7 @@ sub save_account {
                     $form->{IC},            $form->{IC_sale},
                     $form->{IC_cogs},       $form->{IC_taxpart},
                     $form->{IC_income},     $form->{IC_expense},
-                    $form->{IC_taxservice}, $form->{CT_tax}
+                    $form->{IC_taxservice}
     ) {
     $form->{link} .= "${item}:" if ($item);
   }
@@ -965,7 +972,9 @@ sub prepare_template_filename {
     }
 
     $filename .= "." . ($form->{format} eq "html" ? "html" : "tex");
-    $filename =~ s|.*/||;
+    if ($form->{"formname"} =~ m|\.\.| || $form->{"formname"} =~ m|^/|) {
+      $filename =~ s|.*/||;
+    }
     $display_filename = $filename;
     $filename = "$myconfig->{templates}/$filename";
   }