X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=d81e9b16e103bd973a68f40a6722e66e0f3eb651;hb=98662ad2b031a81c88ce6da0babf6f9d0b37059a;hp=f8a05aa96eddd24bfc617a98b34eef343b8fa291;hpb=8ec0d29a33e23ce962b807e87cc8b577c8c98ec2;p=kivitendo-erp.git

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index f8a05aa96..d81e9b16e 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -475,10 +475,10 @@ sub show_invoices {
 
 
     $column_data{dunning_description}           = qq|<td><input type=hidden name=inv_id_$i size=2 value="$ref->{id}"><input type=hidden name=customer_id_$i size=2 value="$ref->{customer_id}">$ref->{dunning_level}:&nbsp;$dunning</td>|;
-    my $active = "checked";
+    my $active = ($ref->{active}) ? "checked" : "";
     $column_data{active} =
       qq|<td><input type=checkbox name=active_$i value=1 $active></td>|;
-    my $email = "checked";
+    my $email = ($ref->{email}) ? "checked" : "";
   $column_data{email} =
     qq|<td><input type=checkbox name=email_$i value=1 $email></td>|;
     $column_data{next_duedate}           = qq|<td><input type=hidden name=next_duedate_$i size=6 value="$ref->{next_duedate}">$ref->{next_duedate}</td>|;
@@ -552,6 +552,12 @@ sub save {
   }
 
   DN->save_config(\%myconfig, \%$form);
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+  	$form->{addition} = "SAVED FOR DUNNING";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
   $form->redirect($locale->text('Dunning Process Config saved!'));
 
   $lxdebug->leave_sub();
@@ -605,7 +611,12 @@ sub save_dunning {
   if($form->{DUNNING_PDFS}) {
     DN->melt_pdfs(\%myconfig, \%$form,$spool);
   }
-
+  # saving the history
+  if(!exists $form->{addition} && $form->{id} ne "") {
+  	$form->{addition} = "DUNNING STARTED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history 
   $form->redirect($locale->text('Dunning Process started for selected invoices!'));
 
   $lxdebug->leave_sub();
@@ -896,16 +907,20 @@ sub show_dunning {
   
 
   $dunning = qq|<select name=next_dunning_id_$i>$form->{selectdunning}</select>|;
-
-
-    $column_data{dunning_description}           = qq|<td>$ref->{dunning_description}</td>|;
+    my $script = "";
+    if ($ref->{invoice}) {
+      $script = "is.pl";
+    } else {
+      $script = "ar.pl";
+    }
+    $column_data{dunning_description}           = qq|<td><a href=dn.pl?action=print_dunning&dunning_id=$ref->{dunning_id}&format=pdf&media=screen&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{dunning_description}</a></td>|;
     my $active = "checked";
     $column_data{dunning_date}           = qq|<td>$ref->{dunning_date}</td>|;
     $column_data{next_duedate}           = qq|<td>$ref->{dunning_duedate}</td>|;
 
     $column_data{inv_duedate}           = qq|<td>$ref->{duedate}</td>|;
     $column_data{invdate}           = qq|<td>$ref->{transdate}</td>|;
-    $column_data{invnumber}           = qq|<td><a href=ar.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{invnumber}</a></td>|;
+    $column_data{invnumber}           = qq|<td><a href=$script?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{invnumber}</a></td>|;
     $column_data{customername}           = qq|<td>$ref->{customername}</td>|;
     $column_data{invamount}           = qq|<td>$ref->{amount}</td>|;
     $column_data{fee}           = qq|<td>$ref->{fee}</td>|;
@@ -953,5 +968,21 @@ sub show_dunning {
   $lxdebug->leave_sub();
 
 }
+
+sub print_dunning {
+  $lxdebug->enter_sub();
+
+  DN->print_dunning(\%myconfig, \%$form, $form->{dunning_id}, $userspath,$spool, $sendmail);
+
+  if($form->{DUNNING_PDFS}) {
+    DN->melt_pdfs(\%myconfig, \%$form,$spool);
+  } else {
+    $form->redirect($locale->text('Could not create dunning copy!'));
+  }
+
+  $lxdebug->leave_sub();
+
+}
+
 # end of main