X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=293f076406360ad4a357b5ec309cb05fa51e1e1a;hb=3c5e4df9e938a8f2c9b045774bda00095b976e49;hp=bd96d3edc29db009f45eb5b066be86a297a543b7;hpb=7dab0cbdf9c8d9f1463290ad577e90865d632e93;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index bd96d3edc..293f07640 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -36,8 +36,8 @@ use SL::PE; use SL::DN; use Data::Dumper; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; 1; @@ -51,7 +51,7 @@ sub edit_config { $form->{title} = $locale->text('Edit Dunning Process Config'); $form->{callback} = - "$form->{script}?action=edit_config&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=edit_config&login=$form->{login}&password=$form->{password}" unless $form->{callback}; @column_index = qw(dunning_level dunning_description active auto email payment_terms terms fee interest template); @@ -163,9 +163,8 @@ sub edit_config { $column_data{dunning_level} = qq|$i|; $column_data{dunning_description} = qq||; - my $active = ""; $column_data{active} = - qq||; + qq||; my $email = ""; $column_data{email} = qq||; @@ -202,7 +201,6 @@ sub edit_config { -{path}> {login}> {password}> @@ -272,7 +270,7 @@ sub add { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; @@ -284,12 +282,16 @@ sub add { # without JavaScript Calendar $button1 = - qq||; + qq||; } $form->{fokus} = "search.customer"; + $form->{javascript} .= qq||; $form->header; + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +

{script}> @@ -345,7 +347,6 @@ sub add { {nextsub}> -{path}> {login}> {password}> @@ -383,7 +384,7 @@ sub show_invoices { $form->{nextsub} = "save_dunning"; $form->{callback} = - "$form->{script}?action=show_invoices&path=$form->{path}&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&paymentuntil=$form->{paymentuntil}&groupinvoices=$form->{groupinvoices}&minamount=$form->{minamount}&dunning_level=$form->{dunning_level}¬es=$form->{notes}" + "$form->{script}?action=show_invoices&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&paymentuntil=$form->{paymentuntil}&groupinvoices=$form->{groupinvoices}&minamount=$form->{minamount}&dunning_level=$form->{dunning_level}¬es=$form->{notes}" unless $form->{callback}; @column_index = qw(dunning_description active email customername invnumber invdate inv_duedate invamount next_duedate fee interest ); @@ -465,12 +466,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|; @@ -509,7 +510,7 @@ sub show_invoices {

|; - &print_options; + print_options(); print qq|
{script}> @@ -520,7 +521,6 @@ sub show_invoices { -{path}> {login}> {password}> @@ -553,7 +553,8 @@ sub save { DN->save_config(\%myconfig, \%$form); # saving the history if(!exists $form->{addition} && $form->{id} ne "") { - $form->{addition} = "SAVED FOR DUNNING"; + $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; + $form->{addition} = "SAVED FOR DUNNING"; $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -589,7 +590,7 @@ sub save_dunning { } } if (scalar(@{ $form->{inv_ids} }) != 0) { - DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail); + DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath, $spool, $sendmail); } } } else { @@ -598,7 +599,7 @@ sub save_dunning { @rows = (); $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); } } } @@ -607,7 +608,8 @@ sub save_dunning { } # saving the history if(!exists $form->{addition} && $form->{id} ne "") { - $form->{addition} = "DUNNING STARTED"; + $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"}; + $form->{addition} = "DUNNING STARTED"; $form->save_history($form->dbconnect(\%myconfig)); } # /saving the history @@ -622,7 +624,7 @@ sub set_email { my $callback = "$form->{script}?action=set_email&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_subject input_body input_attachment email_subject email_body email_attachment), grep({ /^[fl]_/ } keys %$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"; @@ -688,22 +690,22 @@ sub search { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; $button2 = qq| - + text('button') . qq|> |; $button3 = qq| - + text('button') . qq|> |; $button4 = qq| - + text('button') . qq|> |; @@ -715,19 +717,24 @@ sub search { # without JavaScript Calendar $button1 = - qq||; + qq||; $button2 = - qq||; - $button1 = - qq||; - $button1 = - qq||; + qq||; + $button3 = + qq||; + $button4 = + qq||; } $form->{fokus} = "search.customer"; + $form->{javascript} .= qq||; $form->header; + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; + print qq| - + {script}> @@ -788,7 +795,6 @@ sub search { {nextsub}> -{path}> {login}> {password}> @@ -820,7 +826,7 @@ sub show_dunning { $form->{callback} = - "$form->{script}?action=show_dunning&path=$form->{path}&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&dunningfrom=$form->{dunningfrom}&dunningto=$form->{dunningto}¬es=$form->{notes}&showold=$form->{showold}&dunning_level=$form->{dunning_level}" + "$form->{script}?action=show_dunning&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&dunningfrom=$form->{dunningfrom}&dunningto=$form->{dunningto}¬es=$form->{notes}&showold=$form->{showold}&dunning_level=$form->{dunning_level}" unless $form->{callback}; @column_index = qw(dunning_description customername invnumber invdate inv_duedate invamount dunning_date next_duedate fee interest ); @@ -887,14 +893,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_customer_id; + my ($previous_dunning_id, $first_row_for_dunning); foreach $ref (@{ $form->{DUNNINGS} }) { $i++; - $j++ if ($previous_customer_id != $ref->{customer_id}); - $j = $j % 2; - $previous_customer_id = $ref->{customer_id}; + + 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| @@ -902,27 +922,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}&customer_id=$ref->{customer_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|| . 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 password callback))) . + qq|">| . H($ref->{invnumber}) . qq||; map { print "$column_data{$_}\n" } @column_index; @@ -950,7 +971,6 @@ sub show_dunning { -{path}> {login}> {password}> @@ -968,7 +988,7 @@ sub show_dunning { sub print_dunning { $lxdebug->enter_sub(); - DN->print_dunning(\%myconfig, \%$form, $form->{dunning_id}, $form->{customer_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);