diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index 4e9ed35748..596dbd29c8 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -512,8 +512,8 @@ EXCHANGE_BACKEND = 'InvenTree.exchange.InvenTreeManualExchangeBackend' email_config = CONFIG.get('email', {}) EMAIL_BACKEND = get_setting( - 'django.core.mail.backends.smtp.EmailBackend', - email_config.get('backend', '') + 'INVENTREE_EMAIL_BACKEND', + email_config.get('backend', 'django.core.mail.backends.smtp.EmailBackend') ) # Email backend settings @@ -537,6 +537,11 @@ EMAIL_HOST_PASSWORD = get_setting( email_config.get('password', ''), ) +DEFAULT_FROM_EMAIL = get_setting( + 'INVENTREE_EMAIL_SENDER', + email_config.get('sender', ''), +) + EMAIL_SUBJECT_PREFIX = '[InvenTree] ' EMAIL_USE_LOCALTIME = False diff --git a/InvenTree/config_template.yaml b/InvenTree/config_template.yaml index e9f32f382e..0a86d88827 100644 --- a/InvenTree/config_template.yaml +++ b/InvenTree/config_template.yaml @@ -85,6 +85,7 @@ email: port: 25 username: '' password: '' + sender: '' tls: False ssl: False