X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=d81e9b16e103bd973a68f40a6722e66e0f3eb651;hb=a143b82a56e889cfda60c2d42fe7d0bdaf73aa83;hp=e79283a6dde98b0eb41e2faaa37b28642e825665;hpb=54e4131e091831e00a861fe2c4f53e344b87ddca;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index e79283a6d..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|"> @@ -448,7 +441,7 @@ sub show_invoices { -
{script}> +{script}> @@ -482,10 +475,10 @@ sub show_invoices { $column_data{dunning_description} = qq||; - 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||; @@ -517,8 +510,8 @@ sub show_invoices {
$ref->{dunning_level}: $dunning$ref->{next_duedate}
|; -&print_options; -print qq| + &print_options; + print qq|
{script}> @@ -531,16 +524,9 @@ print qq| {path}> {login}> {password}> - -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| + +
@@ -566,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(); @@ -586,7 +578,6 @@ sub save_dunning { for my $i (1 .. $form->{rowcount}) { $form->{"active_$i"} *= 1; $lastcustomer = $form->{"customer_id_$i"} unless ($lastcustomer); - #print(STDERR qq|LASTCUSTOMER $lastcustomer AKTUELL $form->{"customer_id_$i"} ACTIVE? $form->{"active_$i"} active $active\n Zeile $i|); if ($form->{"active_$i"} && ($form->{"customer_id_$i"} == $lastcustomer)) { if ($form->{inv_ids}) { $form->{inv_ids} .= qq|,$form->{"inv_id_$i"}|; @@ -604,8 +595,7 @@ sub save_dunning { } if ($form->{inv_ids} ne "") { $form->{inv_ids} .= ")"; - #print(STDERR "Rufe save_dunning_auf für Zeile $form->{inv_ids} von Kunde $lastcustomer\n"); - DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail); + DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail); } } } else { @@ -614,16 +604,19 @@ sub save_dunning { @rows = (); $form->{inv_ids} = qq|($form->{"inv_id_$i"})|; push(@rows, $i); - #print(STDERR "Rufe save_dunning_auf für Zeile $i\n"); DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail); } } } - #print(STDERR Dumper($form->{DUNNING_PDFS})); 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(); @@ -914,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}|; @@ -960,14 +957,6 @@ sub show_dunning { {path}> {login}> {password}> -|; - - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| @@ -979,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