Weitere Feinheiten zum Patch "Verkaeufer und Bearbeiter wurden beim Umwandeln nicht...

[kivitendo-erp.git] / bin / mozilla / dn.pl

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 94af950..af615da 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -209,7 +209,7 @@ sub save_dunning {
   }
 
   if($form->{DUNNING_PDFS}) {
-    DN->melt_pdfs(\%myconfig, $form);
+    DN->melt_pdfs(\%myconfig, $form, $form->{copies});
   }
 
   # saving the history
@@ -220,7 +220,10 @@ sub save_dunning {
   }
   # /saving the history
 
-  $form->redirect($locale->text('Dunning Process started for selected invoices!')) if ($form->{media} eq 'printer');
+  if ($form->{media} eq 'printer') {
+    delete $form->{callback};
+    $form->redirect($locale->text('Dunning Process started for selected invoices!'));
+  }
 
   $lxdebug->leave_sub();
 }
@@ -228,14 +231,6 @@ sub save_dunning {
 sub set_email {
   $lxdebug->enter_sub();
 
-
-  my $callback = "$form->{script}?action=set_email&";
-  map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
-      (qw(login password name input_subject input_body input_attachment email_subject email_body email_attachment), grep({ /^[fl]_/ } keys %$form)));
-
-  if ($form->{email_attachment}) {
-    $form->{email_attachment} = "checked";
-  }
   $form->{"title"} = $locale->text("Set eMail text");
   $form->header();
   print($form->parse_html_template("dunning/set_email"));
@@ -295,7 +290,7 @@ sub show_dunning {
   if (!$form->{callback}) {
     $form->{callback} =
       build_std_url("action=show_dunning", qw(customer_id customer dunning_level department_id invnumber ordnumber
-                                              ransdatefrom transdateto dunningfrom dunningto notes showold));
+                                              transdatefrom transdateto dunningfrom dunningto notes showold));
   }
 
   $form->get_lists('printers'  => 'printers',