X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fdn.pl;h=338d86a2348207c2337948c1b599cc33c9423357;hb=8c7e44938a661e035f62840e1e177353240ace5d;hp=52f6cd55d058c3c8864ff03819c76738167e6a58;hpb=fa654209d149de56340fa28d3f57678bb81562c9;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 52f6cd55d..338d86a23 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -31,26 +31,48 @@ # #====================================================================== +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"; 1; sub edit_config { $lxdebug->enter_sub(); + $auth->assert('config'); + 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"); @@ -61,6 +83,8 @@ sub edit_config { sub add { $lxdebug->enter_sub(); + $auth->assert('dunning_edit'); + # setup customer selection $form->all_vc(\%myconfig, "customer", "AR"); @@ -83,6 +107,8 @@ sub add { sub show_invoices { $lxdebug->enter_sub(); + $auth->assert('dunning_edit'); + DN->get_invoices(\%myconfig, \%$form); $form->{title} = $locale->text('Start Dunning Process'); @@ -95,11 +121,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->{callback} ||= build_std_url("action=show_invoices", qw(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"); @@ -110,6 +144,8 @@ sub show_invoices { sub save { $lxdebug->enter_sub(); + $auth->assert('config'); + for my $i (1 .. $form->{rowcount}) { if ($form->{"dunning_description_$i"} ne "") { $form->isblank("dunning_level_$i", $locale->text('Dunning Level missing in row '). $i); @@ -126,7 +162,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(); @@ -135,6 +171,8 @@ sub save { sub save_dunning { $lxdebug->enter_sub(); + $auth->assert('dunning_edit'); + my $active=1; my @rows = (); undef($form->{DUNNING_PDFS}); @@ -162,7 +200,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); } } @@ -175,12 +213,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); } } if($form->{DUNNING_PDFS}) { - DN->melt_pdfs(\%myconfig, \%$form,$spool); + DN->melt_pdfs(\%myconfig, $form, $form->{copies}); } # saving the history @@ -191,7 +229,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 +240,8 @@ sub save_dunning { sub set_email { $lxdebug->enter_sub(); + $auth->assert('dunning_edit'); - 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 +251,29 @@ sub set_email { sub search { $lxdebug->enter_sub(); - # setup customer selection - $form->all_vc(\%myconfig, "customer", "AR"); + + $auth->assert('dunning_edit'); + + $form->get_lists("customers" => "ALL_CUSTOMERS", + "departments" => "ALL_DEPARTMENTS"); DN->get_config(\%myconfig, \%$form); - if (@{ $form->{all_customer} }) { - map { $customer .= "\n" - } (@{ $form->{DUNNING} }); - } - $dunning_level = qq| - - | . $locale->text('Next Dunning Level') . qq| - - - | if $form->{selectdunning_level}; - - # departments - if (@{ $form->{all_departments} }) { - $form->{selectdepartment} = "