X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=1992ce8108cec2916c09750db8aa363cd7a40239;hb=860bcda0f04f99d1f832b518011eb278520f1afe;hp=d81e9b16e103bd973a68f40a6722e66e0f3eb651;hpb=2b89ec9756dc1d3525b6163fe4cf4f38af83f9d8;p=kivitendo-erp.git
diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index d81e9b16e..1992ce810 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -105,7 +105,7 @@ sub edit_config {
@@ -446,7 +444,7 @@ sub show_invoices {
- $form->{title} |
+ $form->{title} |
|;
@@ -466,12 +464,12 @@ sub show_invoices {
|;
$form->{selectdunning} =~ s/ selected//g;
- if ($ref->{next_dunning_id} ne "") {
- $form->{selectdunning} =~ s/value=$ref->{next_dunning_id}/value=$ref->{next_dunning_id} selected/;
+ if ($ref->{next_dunning_config_id} ne "") {
+ $form->{selectdunning} =~ s/value=$ref->{next_dunning_config_id}/value=$ref->{next_dunning_config_id} selected/;
}
- $dunning = qq||;
+ $dunning = qq||;
$column_data{dunning_description} = qq|$ref->{dunning_level}: $dunning | |;
@@ -572,18 +570,14 @@ sub save_dunning {
if ($form->{groupinvoices}) {
while ($active) {
$lastcustomer = 0;
- $form->{inv_ids} = "";
+ $form->{inv_ids} = [];
$active = 0;
@rows = ();
for my $i (1 .. $form->{rowcount}) {
$form->{"active_$i"} *= 1;
$lastcustomer = $form->{"customer_id_$i"} unless ($lastcustomer);
if ($form->{"active_$i"} && ($form->{"customer_id_$i"} == $lastcustomer)) {
- if ($form->{inv_ids}) {
- $form->{inv_ids} .= qq|,$form->{"inv_id_$i"}|;
- } else {
- $form->{inv_ids} = qq|($form->{"inv_id_$i"}|;
- }
+ push(@{ $form->{inv_ids} }, $form->{"inv_id_$i"});
$form->{"active_$i"} = 0;
$form->{"customer_id_$i"} = 0;
push(@rows, $i);
@@ -593,18 +587,17 @@ sub save_dunning {
$form->{"customer_id_$i"} = 0;
}
}
- if ($form->{inv_ids} ne "") {
- $form->{inv_ids} .= ")";
- DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail);
+ if (scalar(@{ $form->{inv_ids} }) != 0) {
+ DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath, $spool, $sendmail);
}
}
} else {
for my $i (1 .. $form->{rowcount}) {
if ($form->{"active_$i"}) {
@rows = ();
- $form->{inv_ids} = qq|($form->{"inv_id_$i"})|;
+ $form->{inv_ids} = [ $form->{"inv_id_$i"} ];
push(@rows, $i);
- DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail);
+ DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath, $spool, $sendmail);
}
}
}
@@ -774,7 +767,6 @@ sub search {
$button4
-
@@ -885,7 +877,7 @@ sub show_dunning {
- $form->{title} |
+ $form->{title} |
|;
@@ -894,11 +886,28 @@ sub show_dunning {
print qq|
|;
+
+ my %columns = (
+ "dunning_duedate" => "next_duedate",
+ "duedate" => "inv_duedate",
+ "transdate" => "invdate",
+ "amount" => "invamount",
+ );
+
my $i = 0;
+ my $j = 0;
+ my ($previous_dunning_id, $first_row_for_dunning);
foreach $ref (@{ $form->{DUNNINGS} }) {
-
$i++;
- my $j = $i % 2;
+
+ if ($previous_dunning_id != $ref->{dunning_id}) {
+ $j++;
+ $j = $j % 2;
+ $first_row_for_dunning = 1;
+ } else {
+ $first_row_for_dunning = 0;
+ }
+ $previous_dunning_id = $ref->{dunning_id};
print qq|
@@ -906,27 +915,28 @@ sub show_dunning {
- $dunning = qq||;
- my $script = "";
- if ($ref->{invoice}) {
- $script = "is.pl";
- } else {
- $script = "ar.pl";
+ foreach (qw(dunning_date dunning_duedate duedate transdate customername
+ amount fee interest)) {
+ my $col = $columns{$_} ? $columns{$_} : $_;
+ $column_data{$col} = "" . H($ref->{$_}) . " | ";
}
- $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{customername} = qq|$ref->{customername} | |;
- $column_data{invamount} = qq|$ref->{amount} | |;
- $column_data{fee} = qq|$ref->{fee} | |;
- $column_data{interest} = qq|$ref->{interest} | |;
+ if ($first_row_for_dunning) {
+ $column_data{dunning_description} =
+ qq|{$_}) } qw(login path password callback))) .
+ qq|">| . H($ref->{dunning_description}) . qq| | |;
+ } else {
+ $column_data{dunning_description} = qq| | |;
+ $column_data{customername} = qq| | |;
+ }
+ $column_data{invnumber} =
+ qq|{id}) .
+ join(map({ "&${_}=" . E($form->{$_}) } qw(login path password callback))) .
+ qq|">| . H($ref->{invnumber}) . qq| | |;
map { print "$column_data{$_}\n" } @column_index;
@@ -972,7 +982,7 @@ sub show_dunning {
sub print_dunning {
$lxdebug->enter_sub();
- DN->print_dunning(\%myconfig, \%$form, $form->{dunning_id}, $userspath,$spool, $sendmail);
+ DN->print_dunning(\%myconfig, \%$form, $form->{dunning_id}, $userspath, $spool, $sendmail);
if($form->{DUNNING_PDFS}) {
DN->melt_pdfs(\%myconfig, \%$form,$spool);