X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=4a094d2c1ad935ee64dcfafc0dbb0df05f90c4a8;hb=a25ac4907df1aca0db5fd0017b96e5d0bc5eadf1;hp=cd49158ab48da0ddab13ab14664d51167f2e5f93;hpb=ba364b4cfd18d784c7e0f4e67368fdfc92df4759;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index cd49158ab..4a094d2c1 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -152,10 +152,17 @@ sub display_row { qq|| . $locale->text('Part Description') . qq||; - $column_data{ship} = + if ($form->{"type"} eq "purchase_order") { + $column_data{ship} = qq|| - . $locale->text('Ship') - . qq||; + . $locale->text('Ship rcvd') + . qq||; + } else { + $column_data{ship} = + qq|| + . $locale->text('Ship') + . qq||; + } $column_data{qty} = qq|| . $locale->text('Qty') @@ -1273,8 +1280,10 @@ sub e_mail { } if ($myconfig{role} eq 'admin') { $bcc = qq| - | . $locale->text('Bcc') . qq| - + + | . $locale->text('Bcc') . qq| + + |; } @@ -1294,44 +1303,105 @@ sub e_mail { $form->{oldmedia} = $form->{media}; $form->{media} = "email"; + my %formname_translations = + ( + "bin_list" => $locale->text('Bin List'), + "credit_note" => $locale->text('Credit Note'), + "invoice" => $locale->text('Invoice'), + "packing_list" => $locale->text('Packing List'), + "pick_list" => $locale->text('Pick List'), + "proforma" => $locale->text('Proforma Invoice'), + "purchase_order" => $locale->text('Purchase Order'), + "request_quotation" => $locale->text('RFQ'), + "sales_order" => $locale->text('Confirmation'), + "sales_quotation" => $locale->text('Quotation'), + "storno_invoice" => $locale->text('Storno Invoice'), + "storno_packing_list" => $locale->text('Storno Packing List'), + ); + + my $attachment_filename = $formname_translations{$form->{"formname"}}; + my $prefix; + + if ($form->{"type"} =~ /invoice/) { + $prefix = "inv"; + } elsif ($form->{"type"} =~ /_quotation$/) { + $prefix = "quo"; + } else { + $prefix = "ord"; + } + + if ($attachment_filename && $form->{"${prefix}number"}) { + $attachment_filename .= "_" . $form->{"${prefix}number"} . + ($form->{"format"} =~ /pdf/i ? ".pdf" : + $form->{"format"} =~ /postscript/i ? ".ps" : + $form->{"format"} =~ /opendocument/i ? ".odt" : + $form->{"format"} =~ /html/i ? ".html" : ""); + $attachment_filename =~ s/ /_/g; + my %umlaute = + ( + "ä" => "ae", "ö" => "oe", "ü" => "ue", + "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", + "ß" => "ss" + ); + map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute)); + } else { + $attachment_filename = ""; + } + + if ($form->{"email"}) { + $form->{"fokus"} = "Form.subject"; + } else { + $form->{"fokus"} = "Form.email"; + } $form->header; print qq| - + -
{script}> + - - - +
$title
+ + @@ -1347,21 +1417,21 @@ sub e_mail { # save all other variables foreach $key (keys %$form) { $form->{$key} =~ s/\"/"/g; - print qq|\n|; + print qq|\n|; } print qq| - +
$title
- - - - - - - - - - - $bcc - +
| . $locale->text('To') . qq|| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
+ + + + + + + + + $bcc + + + + + + +
| . $locale->text('To') . qq|
| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
| . $locale->text('Attachment name') . + qq|
- - - - - - - +
| . $locale->text('Message') . qq|
+ + + + + +
| . $locale->text('Message') . qq|
- +
-