X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=419b4f4bd5dad11509bfc56c38a25e9983c4c7c7;hb=549f187d3a2b1d15f96c4556714666ed954447bb;hp=8f8efc5b6a78f7277e8202a458a48e1ad020c30a;hpb=a422e87f5acc0cb9ecbc76f46b416c6d99f27a38;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 8f8efc5b6..419b4f4bd 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -34,6 +34,9 @@ use POSIX qw(strftime); +use List::Util qw(notall); +use List::MoreUtils qw(none); + use SL::IS; use SL::DN; use SL::DB::Department; @@ -41,7 +44,9 @@ use SL::DB::Dunning; use SL::File; use SL::Helper::Flash qw(flash); use SL::Locale::String qw(t8); +use SL::Presenter::EmailJournal; use SL::Presenter::FileObject; +use SL::Presenter::WebdavObject; use SL::ReportGenerator; require "bin/mozilla/common.pl"; @@ -207,6 +212,7 @@ sub save_dunning { my $active=1; my @rows = (); + my @status; undef($form->{DUNNING_PDFS}); my $saved_language_id = $form->{language_id}; @@ -239,7 +245,10 @@ sub save_dunning { if (!$form->{force_lang}) { $form->{language_id} = @{$level}[0]->{language_id}; } - DN->save_dunning(\%myconfig, $form, $level); + my $rc = DN->save_dunning(\%myconfig, $form, $level); + $rc->{error} =~ s{\n}{
}g if $rc->{error}; + push @status, { invnumbers => [map { $form->{'invnumber_' . $_->{row}} } @$level], + map { ( $_ => $rc->{$_} ) } qw(error dunning_id print_original_invoice send_email), }; } } @@ -257,15 +266,27 @@ sub save_dunning { if (!$form->{force_lang}) { $form->{language_id} = @{$level}[0]->{language_id}; } - DN->save_dunning(\%myconfig, $form, $level); + my $rc = DN->save_dunning(\%myconfig, $form, $level); + $rc->{error} =~ s{\n}{
}g if $rc->{error}; + push @status, { invnumbers => [map { $form->{'invnumber_' . $_->{row}} } @$level], + map { ( $_ => $rc->{$_} ) } qw(error dunning_id print_original_invoice send_email), }; } } $form->{language_id} = $saved_language_id; - if (scalar @{ $form->{DUNNING_PDFS} }) { + my $pdf_filename; + my $pdf_content; + if ($form->{DUNNING_PDFS} && scalar @{ $form->{DUNNING_PDFS} }) { $form->{dunning_id} = strftime("%Y%m%d", localtime time) if scalar @{ $form->{DUNNING_PDFS}} > 1; - DN->melt_pdfs(\%myconfig, $form, $form->{copies}); + ($pdf_filename, $pdf_content) = DN->melt_pdfs(\%myconfig, $form, $form->{copies}, return_content => $form->{media} ne 'printer'); + + flash('info', t8('Dunning Process started for selected invoices!')); + if ($form->{media} eq 'printer') { + flash('info', t8('The PDF has been printed')); + } else { + flash('info', t8('The PDF has been created')); + } } # saving the history @@ -276,10 +297,13 @@ sub save_dunning { } # /saving the history - if ($form->{media} eq 'printer') { - delete $form->{callback}; - $form->redirect($locale->text('Dunning Process started for selected invoices!')); - } + setup_dn_status_action_bar(); + $form->{"title"} = $locale->text("Dunning status"); + $form->header(); + print $form->parse_html_template('dunning/status', { + pdf_filename => $pdf_filename, + pdf_content => $pdf_content, + status => \@status, }); $main::lxdebug->leave_sub(); } @@ -293,7 +317,10 @@ sub set_email { $main::auth->assert('dunning_edit'); $form->{"title"} = $locale->text("Set eMail text"); - $form->header(no_layout => 1); + $form->header( + no_layout => 1, + use_javascripts => [ qw(ckeditor/ckeditor ckeditor/adapters/jquery) ], + ); print($form->parse_html_template("dunning/set_email")); $main::lxdebug->leave_sub(); @@ -337,8 +364,9 @@ sub show_dunning { $main::auth->assert('dunning_edit'); - my @filter_field_list = qw(customer_id customer dunning_level department_id invnumber ordnumber - transdatefrom transdateto dunningfrom dunningto notes showold l_salesman salesman_id); + my @filter_field_list = qw(customer_id customer dunning_id dunning_level department_id invnumber ordnumber + transdatefrom transdateto dunningfrom dunningto notes showold l_salesman salesman_id + l_mails l_webdav l_documents); report_generator_set_default_sort('customername', 1); @@ -375,29 +403,32 @@ sub show_dunning { 'transdate' => { 'text' => $locale->text('Invdate') }, 'duedate' => { 'text' => $locale->text('Invoice Duedate') }, 'amount' => { 'text' => $locale->text('Amount') }, + 'dunning_id' => { 'text' => $locale->text('Dunning number') }, 'dunning_date' => { 'text' => $locale->text('Dunning Date') }, 'dunning_duedate' => { 'text' => $locale->text('Dunning Duedate') }, 'fee' => { 'text' => $locale->text('Total Fees') }, 'interest' => { 'text' => $locale->text('Interest') }, 'salesman' => { 'text' => $locale->text('Salesperson'), 'visible' => $form->{l_salesman} ? 1 : 0 }, - 'documents' => { 'text' => $locale->text('Documents') , 'visible' => $::instance_conf->get_doc_storage ? 1 : 0 }, + 'documents' => { 'text' => $locale->text('Documents'), 'visible' => $form->{l_documents}? 1 : 0 }, + 'webdav' => { 'text' => $locale->text('WebDAV'), 'visible' => $form->{l_webdav} ? 1 : 0 }, + 'mails' => { 'text' => $locale->text('Mails'), 'visible' => $form->{l_mails} ? 1 : 0 }, ); $report->set_columns(%column_defs); - $report->set_column_order(qw(checkbox dunning_description customername language invnumber transdate - duedate amount dunning_date dunning_duedate fee interest salesman)); + $report->set_column_order(qw(checkbox dunning_description dunning_id customername language invnumber transdate + duedate amount dunning_date dunning_duedate fee interest salesman departmentname mails webdav documents)); $report->set_sort_indicator($form->{sort}, $form->{sortdir}); my $edit_url = sub { build_std_url('script=' . ($_[0]->{invoice} ? 'is' : 'ar') . '.pl', 'action=edit', 'callback') . '&id=' . $::form->escape($_[0]->{id}) }; my $print_url = sub { build_std_url('action=print_dunning', 'format=pdf', 'media=screen', 'dunning_id='.$_[0]->{dunning_id}, 'language_id=' . $_[0]->{language_id}) }; my $sort_url = build_std_url('action=show_dunning', grep { $form->{$_} } @filter_field_list); - foreach my $name (qw(dunning_description customername invnumber transdate duedate dunning_date dunning_duedate salesman)) { + foreach my $name (qw(dunning_description customername invnumber transdate duedate dunning_date dunning_duedate salesman dunning_id)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $sort_url . "&sort=$name&sortdir=$sortdir"; } - my %alignment = map { $_ => 'right' } qw(transdate duedate amount dunning_date dunning_duedate fee interest salesman); + my %alignment = map { $_ => 'right' } qw(transdate duedate amount dunning_date dunning_duedate fee interest salesman dunning_id); my ($current_dunning_rows, $previous_dunning_id, $first_row_for_dunning); @@ -423,12 +454,13 @@ sub show_dunning { my $row = { }; foreach my $column (keys %{ $ref }) { $row->{$column} = { - 'data' => $first_row_for_dunning || (($column ne 'dunning_description') && ($column ne 'customername')) ? $ref->{$column} : '', + 'data' => $first_row_for_dunning || (none { $_ eq $column } qw(dunning_description customername dunning_id)) ? $ref->{$column} : '', 'align' => $alignment{$column}, 'link' => ( $column eq 'invnumber' ? $edit_url->($ref) : $column eq 'dunning_description' ? $print_url->($ref) + : $column eq 'dunning_id' ? $print_url->($ref) : ''), }; } @@ -447,10 +479,10 @@ sub show_dunning { $row->{language} = { }; } - if ($::instance_conf->get_doc_storage) { - my @files = SL::File->get_all_versions(object_id => $ref->{id}, - object_type => 'dunning' . $ref->{dunning_level}, - file_type => 'document',); + if ($form->{l_documents} && $first_row_for_dunning) { + my @files = SL::File->get_all_versions(object_id => $ref->{dunning_id}, + object_type => 'dunning', + file_type => 'document',); if (scalar @files) { my $html = join '
', map { SL::Presenter::FileObject::file_object($_) } @files; my $text = join "\n", map { $_->file_name } @files; @@ -459,6 +491,32 @@ sub show_dunning { $row->{documents} = { }; } } + if ($form->{l_webdav} && $first_row_for_dunning) { + my $webdav = SL::Webdav->new( + type => 'dunning', + number => $ref->{dunning_id}, + ); + my @all_objects = $webdav->get_all_objects; + if (scalar @all_objects) { + my $html = join '
', map { SL::Presenter::WebdavObject::webdav_object($_) } @all_objects; + my $text = join "\n", map { $_->filename } @all_objects; + $row->{webdav} = { 'raw_data' => $html, data => $text }; + } else { + $row->{webdav} = { }; + } + } + + if ($form->{l_mails}) { + my @mail_links = RecordLinks->get_links(from_table => 'dunning', to_table => 'email_journal', from_id => $ref->{dunning_table_id}); + if (scalar @mail_links) { + my $email_journals = SL::DB::Manager::EmailJournal->get_all(where => [id => [ map { $_->{to_id} } @mail_links ]]); + my $html = join '
', map { SL::Presenter::EmailJournal::email_journal($_) } @$email_journals; + my $text = join "\n", map { $_->subject } @$email_journals; + $row->{mails} = { 'raw_data' => $html, data => $text }; + } else { + $row->{mails} = { }; + } + } push @{ $current_dunning_rows }, $row; @@ -552,6 +610,11 @@ sub print_multiple { $form->{dunning_id} = $dunning_id; DN->print_invoice_for_fees(\%myconfig, $form, $dunning_id); DN->print_dunning(\%myconfig, $form, $dunning_id); + + # print original dunned invoices, if they where printed on dunning run + my $dunnings = SL::DB::Manager::Dunning->get_all(where => [dunning_id => $dunning_id, original_invoice_printed => 1]); + DN->print_original_invoice(\%myconfig, $form, $dunning_id, $_->trans_id) for @$dunnings; + $i++; } $form->{language_id} = $saved_language_id; @@ -667,4 +730,17 @@ sub setup_dn_edit_config_action_bar { } } +sub setup_dn_status_action_bar { + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Back'), + link => $::form->{callback}, + accesskey => 'enter', + ], + ); + } + +} + # end of main