From b52dc22eca57b975473f39b0aed26a2e53468f04 Mon Sep 17 00:00:00 2001 From: hungdztrau123 Date: Mon, 3 Jun 2024 14:02:59 +0700 Subject: [PATCH] fix/asign-warehouse --- src-ui/src/app/data/mail-rule.ts | 2 +- src/documents/consumer.py | 4 ---- src/documents/signals/handlers.py | 8 -------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src-ui/src/app/data/mail-rule.ts b/src-ui/src/app/data/mail-rule.ts index 1f9a82757..b930a53f6 100644 --- a/src-ui/src/app/data/mail-rule.ts +++ b/src-ui/src/app/data/mail-rule.ts @@ -67,7 +67,7 @@ export interface MailRule extends ObjectWithPermissions { assign_document_type?: number // PaperlessDocumentType.id - assign_warehouse?: number // PaperlessWarehouse.id + // assign_warehouse?: number // PaperlessWarehouse.id assign_correspondent_from?: MailMetadataCorrespondentOption diff --git a/src/documents/consumer.py b/src/documents/consumer.py index de73e15a2..d39aa4881 100644 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -111,10 +111,6 @@ class WorkflowTriggerPlugin( action_overrides.document_type_id = ( action.assign_document_type.pk ) - if action.assign_warehouse is not None: - action_overrides.warehouse_id = ( - action.assign_warehouse.pk - ) if action.assign_storage_path is not None: action_overrides.storage_path_id = ( action.assign_storage_path.pk diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index b7cec1213..d9fc593e1 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -624,9 +624,6 @@ def run_workflow( if action.assign_correspondent is not None: document.correspondent = action.assign_correspondent - if action.assign_warehouse is not None: - document.warehouse = action.assign_warehouse - if action.assign_document_type is not None: document.document_type = action.assign_document_type @@ -650,11 +647,6 @@ def run_workflow( if document.document_type is not None else "" ), - ( - document.warehouse.name - if document.warehouse is not None - else "" - ), ( document.owner.username if document.owner is not None