X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=6987c713661540f6c504791cd5e4cbabe14366f9;hb=5ca651f0b08f68c1f977868204b3629217785157;hp=c1d5bfe08f03b06ac51e8061fbd3b218d88d8a93;hpb=f73ef83b744b60ee18c232726ca8904cad42b1bc;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index c1d5bfe08..6987c7136 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -670,6 +670,7 @@ sub select_item { + {id}> @@ -732,7 +733,9 @@ sub item_selected { $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } - qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable); + qw(id partnumber description sellprice listprice inventory_accno + income_accno expense_accno bin unit weight assembly taxaccounts + partsgroup formel longdescription not_discountable partnotes); if ($form->{"part_payment_id_$i"} ne "") { $form->{payment_id} = $form->{"part_payment_id_$i"}; } @@ -1280,8 +1283,10 @@ sub e_mail { } if ($myconfig{role} eq 'admin') { $bcc = qq| - | . $locale->text('Bcc') . qq| - + + | . $locale->text('Bcc') . qq| + + |; } @@ -1301,44 +1306,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
+ + @@ -1354,21 +1420,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|
- +
-
@@ -1406,6 +1472,16 @@ sub print_options { $myconfig{"copies"} ? $myconfig{"copies"} : 3; + $form->{"media"} = + $form->{"media"} ? $form->{"media"} : + $myconfig{"default_media"} ? $myconfig{"default_media"} : + "screen"; + + $form->{"printer_id"} = + defined($form->{"printer_id"}) ? $form->{"printer_id"} : + $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} : + ""; + $form->{PD}{ $form->{formname} } = "selected"; $form->{DF}{ $form->{format} } = "selected"; $form->{OP}{ $form->{media} } = "selected"; @@ -1539,11 +1615,12 @@ sub print_options { } if (scalar(keys (%{ $form->{printers} })) !=0) { - - $printer_select = qq| |; foreach $item (@{ $form->{printers} }) { - $printer_select .= qq||; + $selected = $item->{"id"} == $form->{"printer_id"} ? "selected" : ""; + $printer_select .= qq||; } } @@ -1746,7 +1823,7 @@ sub print_form { $inv = "quo"; $due = "req"; $form->{"${inv}date"} = $form->{transdate}; - $form->{"invdate"} = $form->{transdate}; + $form->{"invdate"} = $form->{transdate}; $form->{label} = $locale->text('Proforma Invoice'); $numberfld = "sqnumber"; $order = 1; @@ -1764,7 +1841,9 @@ sub print_form { $form->isblank("email", $locale->text('E-mail address missing!')) if ($form->{media} eq 'email'); $form->isblank("${inv}date", - $locale->text($form->{label} . ' Date missing!')); + $locale->text($form->{label}) + . ": " + . $locale->text(' Date missing!')); # $locale->text('Invoice Number missing!') # $locale->text('Invoice Date missing!')