X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fdn.pl;h=8a193426ee71e3c445dd7cd820990df5b3c016bc;hb=6ebad56e58db857141565f397c555524cba43109;hp=52f6cd55d058c3c8864ff03819c76738167e6a58;hpb=fa654209d149de56340fa28d3f57678bb81562c9;p=kivitendo-erp.git
diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 52f6cd55d..8a193426e 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -31,12 +31,15 @@
#
#======================================================================
+use POSIX;
+
use SL::IS;
use SL::PE;
use SL::DN;
-use Data::Dumper;
+use SL::ReportGenerator;
require "bin/mozilla/common.pl";
+require "bin/mozilla/reportgenerator.pl";
require "bin/mozilla/io.pl";
require "bin/mozilla/arap.pl";
@@ -46,14 +49,32 @@ sub edit_config {
$lxdebug->enter_sub();
DN->get_config(\%myconfig, \%$form);
+ $form->get_lists('charts' => { 'key' => 'ALL_CHARTS',
+ 'transdate' => 'current_date' });
+
+ $form->{SELECT_AR_AMOUNT} = [];
+ $form->{SELECT_AR} = [];
+
+ foreach my $chart (@{ $form->{ALL_CHARTS} }) {
+ $chart->{LINKS} = { map { $_, 1 } split m/:/, $chart->{link} };
+
+ if ($chart->{LINKS}->{AR}) {
+ $chart->{AR_selected} = "selected" if $chart->{id} == $form->{AR};
+ push @{ $form->{SELECT_AR} }, $chart;
+ }
+
+ if ($chart->{LINKS}->{AR_amount}) {
+ $chart->{AR_amount_fee_selected} = "selected" if $chart->{id} == $form->{AR_amount_fee};
+ $chart->{AR_amount_interest_selected} = "selected" if $chart->{id} == $form->{AR_amount_interest};
+ push @{ $form->{SELECT_AR_AMOUNT} }, $chart;
+ }
+ }
- $form->{title} = $locale->text('Edit Dunning Process Config');
- $form->{callback} ||= build_std_url("action=edit_config");
- $form->{rowcount} = 1 + scalar @{ $form->{DUNNING} };
- $form->{rowcount_odd} = $form->{rowcount} % 2;
+ $form->{title} = $locale->text('Edit Dunning Process Config');
+ $form->{callback} ||= build_std_url("action=edit_config");
$form->header();
- print $form->parse_html_template("dunning/edit_config");
+ print $form->parse_html_template2("dunning/edit_config");
$lxdebug->leave_sub();
}
@@ -95,11 +116,19 @@ sub show_invoices {
map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount fee interest);
}
+ $form->get_lists('printers' => 'printers',
+ 'languages' => 'languages');
+
+ $form->{type} = 'dunning';
$form->{rowcount} = scalar @{ $form->{DUNNINGS} };
$form->{jsscript} = 1;
$form->{callback} ||= build_std_url("action=show_invoices", qw(login password customer invnumber ordnumber groupinvoices minamount dunning_level notes));
- $form->{PRINT_OPTIONS} = print_options(1);
+ $form->{PRINT_OPTIONS} = print_options({ 'inline' => 1,
+ 'no_queue' => 1,
+ 'no_postscript' => 1,
+ 'no_html' => 1,
+ 'no_opendocument' => 1, });
$form->header();
print $form->parse_html_template("dunning/show_invoices");
@@ -126,7 +155,7 @@ sub save {
$form->{addition} = "SAVED FOR DUNNING";
$form->save_history($form->dbconnect(\%myconfig));
}
- # /saving the history
+ # /saving the history
$form->redirect($locale->text('Dunning Process Config saved!'));
$lxdebug->leave_sub();
@@ -162,7 +191,7 @@ sub save_dunning {
foreach my $level (values %{ $levels }) {
next unless scalar @{ $level };
- DN->save_dunning(\%myconfig, \%$form, $level, $userspath, $spool, $sendmail);
+ DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool, $sendmail);
}
}
@@ -175,12 +204,12 @@ sub save_dunning {
"customer_id" => $form->{"customer_id_$i"},
"next_dunning_config_id" => $form->{"next_dunning_config_id_$i"},
"email" => $form->{"email_$i"}, } ];
- DN->save_dunning(\%myconfig, \%$form, $level, $userspath, $spool, $sendmail);
+ DN->save_dunning(\%myconfig, $form, $level, $userspath, $spool, $sendmail);
}
}
if($form->{DUNNING_PDFS}) {
- DN->melt_pdfs(\%myconfig, \%$form,$spool);
+ DN->melt_pdfs(\%myconfig, $form, $form->{copies});
}
# saving the history
@@ -191,7 +220,10 @@ sub save_dunning {
}
# /saving the history
- $form->redirect($locale->text('Dunning Process started for selected invoices!'));
+ if ($form->{media} eq 'printer') {
+ delete $form->{callback};
+ $form->redirect($locale->text('Dunning Process started for selected invoices!'));
+ }
$lxdebug->leave_sub();
}
@@ -199,14 +231,6 @@ sub save_dunning {
sub set_email {
$lxdebug->enter_sub();
-
- my $callback = "$form->{script}?action=set_email&";
- map({ $callback .= "$_=" . $form->escape($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";
- }
$form->{"title"} = $locale->text("Set eMail text");
$form->header();
print($form->parse_html_template("dunning/set_email"));
@@ -216,178 +240,27 @@ sub set_email {
sub search {
$lxdebug->enter_sub();
- # setup customer selection
- $form->all_vc(\%myconfig, "customer", "AR");
+
+ $form->get_lists("customers" => "ALL_CUSTOMERS",
+ "departments" => "ALL_DEPARTMENTS");
DN->get_config(\%myconfig, \%$form);
- if (@{ $form->{all_customer} }) {
- map { $customer .= "