X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=d81e9b16e103bd973a68f40a6722e66e0f3eb651;hb=644c68bae03521cec693800af0a19b9ab4e0ed9c;hp=6bb5614b05362d0696c48214b25d769c12234e78;hpb=3dd4f1330093381e0b7b342861a8ff4b22e3453c;p=kivitendo-erp.git
diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 6bb5614b0..d81e9b16e 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -207,14 +207,7 @@ sub edit_config {
{password}>
|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+ . $locale->text('Save') . qq|">
@@ -482,10 +475,10 @@ sub show_invoices {
$column_data{dunning_description} = qq|
$ref->{dunning_level}: $dunning | |;
- my $active = "checked";
+ my $active = ($ref->{active}) ? "checked" : "";
$column_data{active} =
qq| | |;
- my $email = "checked";
+ my $email = ($ref->{email}) ? "checked" : "";
$column_data{email} =
qq| | |;
$column_data{next_duedate} = qq|$ref->{next_duedate} | |;
@@ -517,8 +510,8 @@ sub show_invoices {
|
|;
-&print_options;
-print qq|
+ &print_options;
+ print qq|
@@ -565,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();
@@ -618,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();
@@ -909,16 +907,20 @@ sub show_dunning {
$dunning = qq||;
-
-
- $column_data{dunning_description} = qq|$ref->{dunning_description} | |;
+ my $script = "";
+ if ($ref->{invoice}) {
+ $script = "is.pl";
+ } else {
+ $script = "ar.pl";
+ }
+ $column_data{dunning_description} = qq|{dunning_id}&format=pdf&media=screen&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{dunning_description} | |;
my $active = "checked";
$column_data{dunning_date} = qq|$ref->{dunning_date} | |;
$column_data{next_duedate} = qq|$ref->{dunning_duedate} | |;
$column_data{inv_duedate} = qq|$ref->{duedate} | |;
$column_data{invdate} = qq|$ref->{transdate} | |;
- $column_data{invnumber} = qq|{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{invnumber} | |;
+ $column_data{invnumber} = qq|{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{invnumber} | |;
$column_data{customername} = qq|$ref->{customername} | |;
$column_data{invamount} = qq|$ref->{amount} | |;
$column_data{fee} = qq|$ref->{fee} | |;
@@ -955,14 +957,6 @@ sub show_dunning {
{path}>
{login}>
{password}>
-|;
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
@@ -974,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