paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-12 02:26:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/2396-better-mail-actions

Browse Source
This commit is contained in:
Jonas Winkler
2023-02-19 23:29:52 +01:00
parent d7cb7c78af 13ece25de0
commit 8c5ef111d8
164 changed files with 5748 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/paperless_mail/mail.py
View File

@@ -515,6 +515,7 @@ class MailAccountHandler(LoggingMixin):
else None,
override_document_type_id=doc_type.id if doc_type else None,
override_tag_ids=tag_ids,
override_owner_id=rule.owner.id if rule.owner else None,
)
consume_tasks.append(consume_task)
@@ -592,6 +593,7 @@ class MailAccountHandler(LoggingMixin):
override_correspondent_id=correspondent.id if correspondent else None,
override_document_type_id=doc_type.id if doc_type else None,
override_tag_ids=tag_ids,
override_owner_id=rule.owner.id if rule.owner else None,
)
mail_action_task = apply_mail_action.s(