X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=86813c941a3b76fc4eb0b4e34dc82768d1a5f2af;hb=76466336f47eb3be6b76d1fd17d5b9475c975810;hp=f0718716201270d511898b5277687cd52a05d503;hpb=54ce51443886623bb785e7c54492ecbc8dc9b3aa;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index f07187162..86813c941 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -50,6 +50,7 @@ use SL::CT;
use SL::Locale::String qw(t8);
use SL::IC;
use SL::IO;
+use SL::File;
use SL::PriceSource;
use SL::DB::Customer;
@@ -58,7 +59,7 @@ use SL::DB::Language;
use SL::DB::Printer;
use SL::DB::Vendor;
use SL::Helper::CreatePDF;
-use SL::Helper::Flash qw(flash);
+use SL::Helper::Flash;
require "bin/mozilla/common.pl";
@@ -385,7 +386,7 @@ sub display_row {
'-labels' => \%projectnumber_labels,
'-default' => $form->{"project_id_$i"}
));
- $column_data{reqdate} = qq||;
+ $column_data{reqdate} = qq||;
$column_data{subtotal} = sprintf qq||, $form->{"subtotal_$i"} ? 'checked' : '';
# begin marge calculations
@@ -492,7 +493,7 @@ sub display_row {
HEADER => \@HEADER,
});
- if (0 != ($form->{sellprice_total} * 1)) {
+ if (abs($form->{sellprice_total} * 1) >= 0.01) {
$form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
}
@@ -1066,12 +1067,38 @@ sub edit_e_mail {
@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') });
@@ -1088,10 +1115,28 @@ sub send_email {
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};
- print_form("return");
+ delete $form->{emailerr};
Common->save_email_status(\%myconfig, $form);
+ ##TODO andere SAVE HISTORY
$form->{callback} = $callback;
$form->redirect();
@@ -1488,6 +1533,7 @@ sub print_form {
$form->{emailed} .= " $form->{formname}";
$form->{emailed} =~ s/^ //;
+ $form->{addition} = "MAILED";
}
my $emailed = $form->{emailed};