From b7b343222c456df24cc7182496d6142c365a25c3 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:36:47 -0700 Subject: [PATCH] merge mail --- src/documents/signals/handlers.py | 2 +- src/{documents => paperless}/mail.py | 0 src/paperless/views.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{documents => paperless}/mail.py (100%) diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 85058ad05..63cf3e693 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -23,13 +23,13 @@ from django.utils import timezone from filelock import FileLock from guardian.shortcuts import remove_perm -from documents.mail import send_email from documents.templating.workflows import parse_w_workflow_placeholders from paperless import matching from paperless.caching import clear_document_caches from paperless.file_handling import create_source_path_directory from paperless.file_handling import delete_empty_directories from paperless.file_handling import generate_unique_filename +from paperless.mail import send_email from paperless.models import Correspondent from paperless.models import CustomField from paperless.models import CustomFieldInstance diff --git a/src/documents/mail.py b/src/paperless/mail.py similarity index 100% rename from src/documents/mail.py rename to src/paperless/mail.py diff --git a/src/paperless/views.py b/src/paperless/views.py index 9fcd2dd59..535831e51 100644 --- a/src/paperless/views.py +++ b/src/paperless/views.py @@ -100,7 +100,6 @@ from documents.filters import PaperlessTaskFilterSet from documents.filters import ShareLinkFilterSet from documents.filters import StoragePathFilterSet from documents.filters import TagFilterSet -from documents.mail import send_email from documents.schema import generate_object_with_permissions_schema from documents.signals import document_updated from documents.tasks import consume_file @@ -138,6 +137,7 @@ from paperless.db import GnuPG from paperless.filters import GroupFilterSet from paperless.filters import UserFilterSet from paperless.index import DelayedQuery +from paperless.mail import send_email from paperless.matching import match_correspondents from paperless.matching import match_document_types from paperless.matching import match_storage_paths