From: Moritz Bunkus Date: Tue, 10 Jan 2017 15:57:35 +0000 (+0100) Subject: ActionBar: alte Funktionen zum E-Mail-Versand entfernt X-Git-Tag: release-3.5.4~1340 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a6ce2c7f3f7ae10f7065fb86121c8d11049617ee;p=kivitendo-erp.git ActionBar: alte Funktionen zum E-Mail-Versand entfernt --- diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 000fc6eee..6bb2bcc20 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -1177,26 +1177,6 @@ sub save_as_new { $main::lxdebug->leave_sub(); } -sub e_mail { - $main::lxdebug->enter_sub(); - - check_do_access(); - - $::form->mtime_ischanged('delivery_orders','mail'); - - $::form->{print_and_save} = 1; - - my $saved_form = save_form(); - - save(); - - restore_form($saved_form, 0, qw(id ordnumber quonumber)); - - edit_e_mail(); - - $main::lxdebug->leave_sub(); -} - sub calculate_stock_in_out { $main::lxdebug->enter_sub(); @@ -1736,7 +1716,7 @@ sub dispatcher { my $form = $main::form; my $locale = $main::locale; - foreach my $action (qw(update print e_mail save transfer_out transfer_out_default sort + foreach my $action (qw(update print save transfer_out transfer_out_default sort transfer_in transfer_in_default mark_closed save_as_new invoice delete)) { if ($form->{"action_${action}"}) { call_sub($action); diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 0cd7385bd..af912eeb5 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -1026,126 +1026,6 @@ sub request_for_quotation { quotation(); } -sub edit_e_mail { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - - _check_io_auth(); - - if ($form->{second_run}) { - $form->{print_and_post} = 0; - $form->{resubmit} = 0; - } - - $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/; - - if ($form->{"cp_id"}) { - CT->get_contact(\%myconfig, $form); - $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"}; - } - - $form->{language} = $form->get_template_language(\%myconfig); - $form->{language} = "_" . $form->{language} if $form->{language}; - - my $title = $locale->text('E-mail') . " " . $form->get_formname_translation(); - - $form->{oldmedia} = $form->{media}; - $form->{media} = "email"; - - my $global_bcc = AM->get_defaults()->{global_bcc}; - - $form->{bcc} = join ', ', grep $_, $form->{bcc}, $global_bcc; - - my $attachment_filename = $form->generate_attachment_filename(); - my $subject = $form->{subject} || $form->generate_email_subject(); - - $form->header; - - my (@dont_hide_key_list, %dont_hide_key, @hidden_keys); - @dont_hide_key_list = qw(action email cc bcc subject message sendmode format header override login password); - @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list; - @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form; - - my (@files, @vc_files, @part_files, $has_document); - - if ($::instance_conf->get_doc_storage) { - @files = SL::File->get_all_versions(object_id => $form->{id}, object_type => $form->{type}, file_type => 'document'); - $has_document = 1 if scalar(@files) > 0; - @files = SL::File->get_all(object_id => $form->{id}, object_type => $form->{type}, file_type => 'attachment'); - @vc_files = SL::File->get_all(object_id => $form->{"$form->{vc}_id"}, object_type => $form->{vc}) - if $form->{vc} && $form->{"$form->{vc}_id"}; - - my %part_id_map = map { $_->{id} => $_ } grep { $_->{id} } map { - { - 'id' => $form->{"id_$_"}, - 'partname' => $form->{"partnumber_$_"} - } - } (1 .. $form->{rowcount}); - - foreach my $partid (keys %part_id_map) { - my @pfiles = SL::File->get_all(object_id => $partid, object_type => 'part'); - push @part_files, map { $_->{partname} = $part_id_map{$partid}->{partname}; $_ } @pfiles; - } - } - - print $form->parse_html_template('generic/edit_email', - { title => $title, - a_filename => $attachment_filename, - subject => $subject, - has_document => $has_document, - print_options => print_options('inline' => 1), - action => 'send_email', - FILES => \@files, - VC_FILES => \@vc_files, - PART_FILES => \@part_files, - HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], - SHOW_BCC => $::auth->assert('email_bcc', 'may fail') }); - - $main::lxdebug->leave_sub(); -} - -sub send_email { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my %myconfig = %main::myconfig; - - _check_io_auth(); - - my $callback = $form->{script} . "?action=edit"; - map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id)); - if ( $form->{action_oldfile} || $form->{action_nofile} ) { - if (!$form->{email} || $form->{email} =~ /^\s*$/) { - flash('error', $::locale->text('E-mail address missing!')); - } - else { - $form->send_email(\%myconfig,'pdf'); - } - } - else { - print_form("return"); - $form->{addition} = "SCREENED"; - $form->save_history; - $form->{addition} = "MAILED"; - } - - flash_later('info' , $::locale->text('E-Mail is sent to #1', $form->{email})) if !$form->{emailerr}; - flash_later('error', $::locale->text($form->{emailerr})) if $form->{emailerr}; - - delete $form->{emailerr}; - - Common->save_email_status(\%myconfig, $form); - ##TODO andere SAVE HISTORY - - $form->{callback} = $callback; - $form->redirect(); - - $main::lxdebug->leave_sub(); -} - sub print_options { $::lxdebug->enter_sub(); diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 72b4dceca..def63a961 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -1188,35 +1188,9 @@ sub delete { $::form->error($::locale->text('Cannot delete invoice!')); } -sub post_and_e_mail { - e_mail(); -}; - -sub e_mail { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - - $main::auth->assert('invoice_edit'); - - if (!$form->{id}) { - $form->{no_redirect_after_post} = 1; - - my $saved_form = save_form(); - - post(); - - restore_form($saved_form, 0, qw(id invnumber)); - } - - edit_e_mail(); - - $main::lxdebug->leave_sub(); -} - sub dispatcher { for my $action (qw( - print update ship_to e_mail storno post_payment use_as_new credit_note + print update ship_to storno post_payment use_as_new credit_note delete post order preview post_and_e_mail print_and_post mark_as_paid )) { diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 4c33c974a..ac1c6149e 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -2003,27 +2003,6 @@ sub oe_delivery_order_from_order { delivery_order(); } -sub e_mail { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - - check_oe_access(); - - $form->mtime_ischanged('oe','mail'); - $form->{print_and_save} = 1; - - my $saved_form = save_form(); - - save(); - - restore_form($saved_form, 0, qw(id ordnumber quonumber)); - - edit_e_mail(); - - $main::lxdebug->leave_sub(); -} - sub yes { call_sub($main::form->{yes_nextsub}); } @@ -2239,7 +2218,7 @@ sub _oe_remove_delivered_or_billed_rows { } sub dispatcher { - foreach my $action (qw(delete delivery_order e_mail invoice print purchase_order quotation + foreach my $action (qw(delete delivery_order invoice print purchase_order quotation request_for_quotation sales_order save save_and_close save_as_new ship_to update)) { if ($::form->{"action_${action}"}) { call_sub($action);