Revision d9ff130d
Von Moritz Bunkus vor mehr als 4 Jahren hinzugefügt
SL/Form.pm | ||
---|---|---|
1372 | 1372 |
|
1373 | 1373 |
return undef unless $body; |
1374 | 1374 |
|
1375 |
$body .= GenericTranslations->get(translation_type =>"salutation_punctuation_mark", language_id => $self->{language_id}) . "\n"; |
|
1376 |
$body .= GenericTranslations->get(translation_type =>"preset_text_$self->{formname}", language_id => $self->{language_id}); |
|
1375 |
my $translation_type = $params{translation_type} // "preset_text_$self->{formname}"; |
|
1376 |
my $main_body = GenericTranslations->get(translation_type => $translation_type, language_id => $self->{language_id}); |
|
1377 |
$main_body = GenericTranslations->get(translation_type => $params{fallback_translation_type}, language_id => $self->{language_id}) if !$main_body && $params{fallback_translation_type}; |
|
1378 |
$body .= GenericTranslations->get(translation_type => "salutation_punctuation_mark", language_id => $self->{language_id}) . "\n\n"; |
|
1379 |
$body .= $main_body; |
|
1377 | 1380 |
|
1378 | 1381 |
$body = $main::locale->unquote_special_chars('HTML', $body); |
1379 | 1382 |
|
bin/mozilla/generictranslations.pl | ||
---|---|---|
18 | 18 |
preset_text_sales_order => t8('Preset email text for sales orders'), |
19 | 19 |
preset_text_sales_delivery_order => t8('Preset email text for sales delivery orders'), |
20 | 20 |
preset_text_invoice => t8('Preset email text for sales invoices'), |
21 |
preset_text_invoice_direct_debit => t8('Preset email text for sales invoices with direct debit'), |
|
21 | 22 |
preset_text_request_quotation => t8('Preset email text for requests (rfq)'), |
22 | 23 |
preset_text_purchase_order => t8('Preset email text for purchase orders'), |
23 | 24 |
preset_text_periodic_invoices_email_body => t8('Preset email body for periodic invoices'), |
bin/mozilla/io.pl | ||
---|---|---|
2092 | 2092 |
$::form->{language} = $::form->get_template_language(\%::myconfig); |
2093 | 2093 |
$::form->{language} = "_" . $::form->{language}; |
2094 | 2094 |
|
2095 |
my %body_params = (record_email => $record_email); |
|
2096 |
if (($::form->{type} eq 'invoice') && $::form->{direct_debit}) { |
|
2097 |
$body_params{translation_type} = "preset_text_invoice_direct_debit"; |
|
2098 |
$body_params{fallback_translation_type} = "preset_text_invoice"; |
|
2099 |
} |
|
2100 |
|
|
2095 | 2101 |
my $email_form = { |
2096 | 2102 |
to => $email, |
2097 | 2103 |
cc => $email_cc, |
2098 | 2104 |
subject => $::form->generate_email_subject, |
2099 |
message => $::form->generate_email_body('record_email' => $record_email),
|
|
2105 |
message => $::form->generate_email_body(%body_params),
|
|
2100 | 2106 |
attachment_filename => $::form->generate_attachment_filename, |
2101 | 2107 |
js_send_function => 'kivi.SalesPurchase.send_email()', |
2102 | 2108 |
}; |
js/kivi.SalesPurchase.js | ||
---|---|---|
270 | 270 |
var data = { |
271 | 271 |
action: 'show_sales_purchase_email_dialog', |
272 | 272 |
cp_id: $('#cp_id').val(), |
273 |
direct_debit: $('#direct_debit').prop('checked') ? 1 : 0, |
|
273 | 274 |
donumber: $('#donumber').val(), |
274 | 275 |
format: $('#format').val(), |
275 | 276 |
formname: $('#formname').val(), |
locale/de/all | ||
---|---|---|
2429 | 2429 |
'Preset email text for requests (rfq)' => 'Vorbelegter E-Mail-Text für Anfragen', |
2430 | 2430 |
'Preset email text for sales delivery orders' => 'Vorbelegter E-Mail-Text für Verkaufs-Lieferscheine', |
2431 | 2431 |
'Preset email text for sales invoices' => 'Vorbelegter E-Mail-Text für Rechnungen', |
2432 |
'Preset email text for sales invoices with direct debit' => 'Vorbelegter E-Mail-Text für Rechnungen mit Bankeinzug', |
|
2432 | 2433 |
'Preset email text for sales orders' => 'Vorbelegter E-Mail-Text für Aufträge', |
2433 | 2434 |
'Preset email text for sales quotations' => 'Vorbelegter E-Mail-Text für Angebote', |
2434 | 2435 |
'Preview' => 'Vorschau', |
Auch abrufbar als: Unified diff
E-Mail-Versand: vorbelegter Text für Rechnungen mit aktiviertem Bankeinzug