From ca5bdfd69e7a56cee4ce8ab4b6ddbbe486793ce2 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 13 Nov 2020 11:31:48 +0100 Subject: [PATCH] Wiederkehrende Rechnungen: Anrede in E-Mail-Body-Vorbelegung verwenden --- bin/mozilla/oe.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index fa284f0d8..82f2906a6 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -2180,10 +2180,12 @@ sub edit_periodic_invoices_config { }; } # for older configs, replace email preset text if not yet set. - $config->{email_subject} ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, - translation_type =>"preset_text_periodic_invoices_email_subject"); - $config->{email_body} ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, - translation_type =>"preset_text_periodic_invoices_email_body"); + $config->{email_subject} ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "preset_text_periodic_invoices_email_subject"); + $config->{email_body} ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "salutation_general") + . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "salutation_punctuation_mark") + . "\n\n" + . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "preset_text_periodic_invoices_email_body"); + $config->{email_body} =~ s{\A[ \n\r]+|[ \n\r]+\Z}{}g; $config->{periodicity} = 'm' if none { $_ eq $config->{periodicity} } @SL::DB::PeriodicInvoicesConfig::PERIODICITIES; $config->{order_value_periodicity} = 'p' if none { $_ eq $config->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES); -- 2.20.1