Update bulk_edit.py

pyproject.toml

@@ -305,7 +305,6 @@ markers = [
   "greenmail: Tests requiring Greenmail service",
   "date_parsing: Tests which cover date parsing from content or filename",
   "management: Tests which cover management commands/functionality",
-  "profiling: Benchmarks that profile and compare implementation performance",
 ]
 
 [tool.pytest_env]

src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts

@@ -3,6 +3,7 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { DocumentService } from 'src/app/services/rest/document.service'
 import { PDFEditorComponent } from './pdf-editor.component'
 
 describe('PDFEditorComponent', () => {
@@ -139,4 +140,16 @@ describe('PDFEditorComponent', () => {
     expect(component.pages[1].page).toBe(2)
     expect(component.pages[2].page).toBe(3)
   })
+
+  it('should include selected version in preview source when provided', () => {
+    const documentService = TestBed.inject(DocumentService)
+    const previewSpy = jest
+      .spyOn(documentService, 'getPreviewUrl')
+      .mockReturnValue('preview-version')
+    component.documentID = 3
+    component.versionID = 10
+
+    expect(component.pdfSrc).toBe('preview-version')
+    expect(previewSpy).toHaveBeenCalledWith(3, false, 10)
+  })
 })

src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts

@@ -46,6 +46,7 @@ export class PDFEditorComponent extends ConfirmDialogComponent {
   activeModal: NgbActiveModal = inject(NgbActiveModal)
 
   documentID: number
+  versionID?: number
   pages: PageOperation[] = []
   totalPages = 0
   editMode: PdfEditorEditMode = this.settingsService.get(
@@ -55,7 +56,11 @@ export class PDFEditorComponent extends ConfirmDialogComponent {
   includeMetadata: boolean = true
 
   get pdfSrc(): string {
-    return this.documentService.getPreviewUrl(this.documentID)
+    return this.documentService.getPreviewUrl(
+      this.documentID,
+      false,
+      this.versionID
+    )
   }
 
   pdfLoaded(pdf: PngxPdfDocumentProxy) {

src-ui/src/app/components/document-detail/document-detail.component.spec.ts

@@ -1459,22 +1459,25 @@ describe('DocumentDetailComponent', () => {
     const closeSpy = jest.spyOn(openDocumentsService, 'closeDocument')
     const errorSpy = jest.spyOn(toastService, 'showError')
     initNormally()
+    component.selectedVersionId = 10
     component.editPdf()
     expect(modal).not.toBeUndefined()
     modal.componentInstance.documentID = doc.id
+    expect(modal.componentInstance.versionID).toBe(10)
     modal.componentInstance.pages = [{ page: 1, rotate: 0, splitAfter: false }]
     modal.componentInstance.confirm()
     let req = httpTestingController.expectOne(
       `${environment.apiBaseUrl}documents/bulk_edit/`
     )
     expect(req.request.body).toEqual({
-      documents: [doc.id],
+      documents: [10],
       method: 'edit_pdf',
       parameters: {
         operations: [{ page: 1, rotate: 0, doc: 0 }],
         delete_original: false,
         update_document: false,
         include_metadata: true,
+        source_mode: 'explicit_selection',
       },
     })
     req.error(new ErrorEvent('failed'))
@@ -1496,6 +1499,7 @@ describe('DocumentDetailComponent', () => {
     let modal: NgbModalRef
     modalService.activeInstances.subscribe((m) => (modal = m[0]))
     initNormally()
+    component.selectedVersionId = 10
     component.password = 'secret'
     component.removePassword()
     const dialog =
@@ -1508,13 +1512,14 @@ describe('DocumentDetailComponent', () => {
       `${environment.apiBaseUrl}documents/bulk_edit/`
     )
     expect(req.request.body).toEqual({
-      documents: [doc.id],
+      documents: [10],
       method: 'remove_password',
       parameters: {
         password: 'secret',
         update_document: false,
         include_metadata: false,
         delete_original: true,
+        source_mode: 'explicit_selection',
       },
     })
     req.flush(true)

src-ui/src/app/components/document-detail/document-detail.component.ts

@@ -73,7 +73,10 @@ import {
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
-import { DocumentService } from 'src/app/services/rest/document.service'
+import {
+  BulkEditSourceMode,
+  DocumentService,
+} from 'src/app/services/rest/document.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { TagService } from 'src/app/services/rest/tag.service'
@@ -1626,20 +1629,23 @@ export class DocumentDetailComponent
       size: 'xl',
       scrollable: true,
     })
+    const sourceDocumentId = this.selectedVersionId ?? this.document.id
     modal.componentInstance.title = $localize`PDF Editor`
     modal.componentInstance.btnCaption = $localize`Proceed`
     modal.componentInstance.documentID = this.document.id
+    modal.componentInstance.versionID = sourceDocumentId
     modal.componentInstance.confirmClicked
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe(() => {
         modal.componentInstance.buttonsEnabled = false
         this.documentsService
-          .bulkEdit([this.document.id], 'edit_pdf', {
+          .bulkEdit([sourceDocumentId], 'edit_pdf', {
             operations: modal.componentInstance.getOperations(),
             delete_original: modal.componentInstance.deleteOriginal,
             update_document:
               modal.componentInstance.editMode == PdfEditorEditMode.Update,
             include_metadata: modal.componentInstance.includeMetadata,
+            source_mode: BulkEditSourceMode.EXPLICIT_SELECTION,
           })
           .pipe(first(), takeUntil(this.unsubscribeNotifier))
           .subscribe({
@@ -1685,16 +1691,18 @@ export class DocumentDetailComponent
     modal.componentInstance.confirmClicked
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe(() => {
+        const sourceDocumentId = this.selectedVersionId ?? this.document.id
         const dialog =
           modal.componentInstance as PasswordRemovalConfirmDialogComponent
         dialog.buttonsEnabled = false
         this.networkActive = true
         this.documentsService
-          .bulkEdit([this.document.id], 'remove_password', {
+          .bulkEdit([sourceDocumentId], 'remove_password', {
             password: this.password,
             update_document: dialog.updateDocument,
             include_metadata: dialog.includeMetadata,
             delete_original: dialog.deleteOriginal,
+            source_mode: BulkEditSourceMode.EXPLICIT_SELECTION,
           })
           .pipe(first(), takeUntil(this.unsubscribeNotifier))
           .subscribe({

src-ui/src/app/services/rest/document.service.ts

@@ -37,6 +37,11 @@ export interface SelectionData {
   selected_custom_fields: SelectionDataItem[]
 }
 
+export enum BulkEditSourceMode {
+  LATEST_VERSION = 'latest_version',
+  EXPLICIT_SELECTION = 'explicit_selection',
+}
+
 @Injectable({
   providedIn: 'root',
 })

src/documents/bulk_edit.py

@@ -29,12 +29,21 @@ from documents.plugins.helpers import DocumentsStatusManager
 from documents.tasks import bulk_update_documents
 from documents.tasks import consume_file
 from documents.tasks import update_document_content_maybe_archive_file
+from documents.versioning import get_latest_version_for_root
+from documents.versioning import get_root_document
 
 if TYPE_CHECKING:
     from django.contrib.auth.models import User
 
 logger: logging.Logger = logging.getLogger("paperless.bulk_edit")
 
+SourceMode = Literal["latest_version", "explicit_selection"]
+
+
+class SourceModeChoices:
+    LATEST_VERSION: SourceMode = "latest_version"
+    EXPLICIT_SELECTION: SourceMode = "explicit_selection"
+
 
 @shared_task(bind=True)
 def restore_archive_serial_numbers_task(
@@ -72,46 +81,21 @@ def restore_archive_serial_numbers(backup: dict[int, int | None]) -> None:
     logger.info(f"Restored archive serial numbers for documents {list(backup.keys())}")
 
 
-def _get_root_ids_by_doc_id(doc_ids: list[int]) -> dict[int, int]:
-    """
-    Resolve each provided document id to its root document id.
+def _resolve_root_and_source_doc(
+    doc: Document,
+    *,
+    source_mode: SourceMode = SourceModeChoices.LATEST_VERSION,
+) -> tuple[Document, Document]:
+    root_doc = get_root_document(doc)
 
-    - If the id is already a root document: root id is itself.
-    - If the id is a version document: root id is its `root_document_id`.
-    """
-    qs = Document.objects.filter(id__in=doc_ids).only("id", "root_document_id")
-    return {doc.id: doc.root_document_id or doc.id for doc in qs}
+    if source_mode == SourceModeChoices.EXPLICIT_SELECTION:
+        return root_doc, doc
 
+    # Version IDs are explicit by default, only a selected root resolves to latest
+    if doc.root_document_id is not None:
+        return root_doc, doc
 
-def _get_root_and_current_docs_by_root_id(
-    root_ids: set[int],
-) -> tuple[dict[int, Document], dict[int, Document]]:
-    """
-    Returns:
-      - root_docs: root_id -> root Document
-      - current_docs: root_id -> newest version Document (or root if none)
-    """
-    root_docs = {
-        doc.id: doc
-        for doc in Document.objects.filter(id__in=root_ids).select_related(
-            "owner",
-        )
-    }
-    latest_versions_by_root_id: dict[int, Document] = {}
-    for version_doc in Document.objects.filter(root_document_id__in=root_ids).order_by(
-        "root_document_id",
-        "-id",
-    ):
-        root_id = version_doc.root_document_id
-        if root_id is None:
-            continue
-        latest_versions_by_root_id.setdefault(root_id, version_doc)
-
-    current_docs: dict[int, Document] = {
-        root_id: latest_versions_by_root_id.get(root_id, root_docs[root_id])
-        for root_id in root_docs
-    }
-    return root_docs, current_docs
+    return root_doc, get_latest_version_for_root(root_doc)
 
 
 def set_correspondent(
@@ -421,21 +405,32 @@ def rotate(
     doc_ids: list[int],
     degrees: int,
     *,
+    source_mode: SourceMode = SourceModeChoices.LATEST_VERSION,
     user: User | None = None,
 ) -> Literal["OK"]:
     logger.info(
         f"Attempting to rotate {len(doc_ids)} documents by {degrees} degrees.",
     )
-    doc_to_root_id = _get_root_ids_by_doc_id(doc_ids)
-    root_ids = set(doc_to_root_id.values())
-    root_docs_by_id, current_docs_by_root_id = _get_root_and_current_docs_by_root_id(
-        root_ids,
-    )
+    docs_by_id = {
+        doc.id: doc
+        for doc in Document.objects.select_related("root_document").filter(
+            id__in=doc_ids,
+        )
+    }
+    docs_by_root_id: dict[int, tuple[Document, Document]] = {}
+    for doc_id in doc_ids:
+        doc = docs_by_id.get(doc_id)
+        if doc is None:
+            continue
+        root_doc, source_doc = _resolve_root_and_source_doc(
+            doc,
+            source_mode=source_mode,
+        )
+        docs_by_root_id.setdefault(root_doc.id, (root_doc, source_doc))
+
     import pikepdf
 
-    for root_id in root_ids:
-        root_doc = root_docs_by_id[root_id]
-        source_doc = current_docs_by_root_id[root_id]
+    for root_doc, source_doc in docs_by_root_id.values():
         if source_doc.mime_type != "application/pdf":
             logger.warning(
                 f"Document {root_doc.id} is not a PDF, skipping rotation.",
@@ -659,25 +654,17 @@ def delete_pages(
     doc_ids: list[int],
     pages: list[int],
     *,
+    source_mode: SourceMode = SourceModeChoices.LATEST_VERSION,
     user: User | None = None,
 ) -> Literal["OK"]:
     logger.info(
         f"Attempting to delete pages {pages} from {len(doc_ids)} documents",
     )
     doc = Document.objects.select_related("root_document").get(id=doc_ids[0])
-    root_doc: Document
-    if doc.root_document_id is None or doc.root_document is None:
-        root_doc = doc
-    else:
-        root_doc = doc.root_document
-
-    source_doc = (
-        Document.objects.filter(Q(id=root_doc.id) | Q(root_document=root_doc))
-        .order_by("-id")
-        .first()
+    root_doc, source_doc = _resolve_root_and_source_doc(
+        doc,
+        source_mode=source_mode,
     )
-    if source_doc is None:
-        source_doc = root_doc
     pages = sorted(pages)  # sort pages to avoid index issues
     import pikepdf
 
@@ -722,6 +709,7 @@ def edit_pdf(
     delete_original: bool = False,
     update_document: bool = False,
     include_metadata: bool = True,
+    source_mode: SourceMode = SourceModeChoices.LATEST_VERSION,
     user: User | None = None,
 ) -> Literal["OK"]:
     """
@@ -736,19 +724,10 @@ def edit_pdf(
         f"Editing PDF of document {doc_ids[0]} with {len(operations)} operations",
     )
     doc = Document.objects.select_related("root_document").get(id=doc_ids[0])
-    root_doc: Document
-    if doc.root_document_id is None or doc.root_document is None:
-        root_doc = doc
-    else:
-        root_doc = doc.root_document
-
-    source_doc = (
-        Document.objects.filter(Q(id=root_doc.id) | Q(root_document=root_doc))
-        .order_by("-id")
-        .first()
+    root_doc, source_doc = _resolve_root_and_source_doc(
+        doc,
+        source_mode=source_mode,
     )
-    if source_doc is None:
-        source_doc = root_doc
     import pikepdf
 
     pdf_docs: list[pikepdf.Pdf] = []
@@ -859,6 +838,7 @@ def remove_password(
     update_document: bool = False,
     delete_original: bool = False,
     include_metadata: bool = True,
+    source_mode: SourceMode = SourceModeChoices.LATEST_VERSION,
     user: User | None = None,
 ) -> Literal["OK"]:
     """
@@ -868,19 +848,10 @@ def remove_password(
 
     for doc_id in doc_ids:
         doc = Document.objects.select_related("root_document").get(id=doc_id)
-        root_doc: Document
-        if doc.root_document_id is None or doc.root_document is None:
-            root_doc = doc
-        else:
-            root_doc = doc.root_document
-
-        source_doc = (
-            Document.objects.filter(Q(id=root_doc.id) | Q(root_document=root_doc))
-            .order_by("-id")
-            .first()
+        root_doc, source_doc = _resolve_root_and_source_doc(
+            doc,
+            source_mode=source_mode,
         )
-        if source_doc is None:
-            source_doc = root_doc
         try:
             logger.info(
                 f"Attempting password removal from document {doc_ids[0]}",

src/documents/management/commands/document_exporter.py

@@ -3,8 +3,6 @@ import json
 import os
 import shutil
 import tempfile
-from itertools import chain
-from itertools import islice
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -21,7 +19,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.core import serializers
 from django.core.management.base import BaseCommand
 from django.core.management.base import CommandError
-from django.core.serializers.json import DjangoJSONEncoder
 from django.db import transaction
 from django.utils import timezone
 from filelock import FileLock
@@ -29,8 +26,6 @@ from guardian.models import GroupObjectPermission
 from guardian.models import UserObjectPermission
 
 if TYPE_CHECKING:
-    from collections.abc import Generator
-
     from django.db.models import QuerySet
 
 if settings.AUDIT_LOG_ENABLED:
@@ -65,22 +60,6 @@ from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 
 
-def serialize_queryset_batched(
-    queryset: "QuerySet",
-    *,
-    batch_size: int = 500,
-) -> "Generator[list[dict], None, None]":
-    """Yield batches of serialized records from a QuerySet.
-
-    Each batch is a list of dicts in Django's Python serialization format.
-    Uses QuerySet.iterator() to avoid loading the full queryset into memory,
-    and islice to collect chunk-sized batches serialized in a single call.
-    """
-    iterator = queryset.iterator(chunk_size=batch_size)
-    while chunk := list(islice(iterator, batch_size)):
-        yield serializers.serialize("python", chunk)
-
-
 class Command(CryptMixin, BaseCommand):
     help = (
         "Decrypt and rename all files in our collection into a given target "
@@ -207,17 +186,6 @@ class Command(CryptMixin, BaseCommand):
             help="If provided, is used to encrypt sensitive data in the export",
         )
 
-        parser.add_argument(
-            "--batch-size",
-            type=int,
-            default=500,
-            help=(
-                "Number of records to process per batch during serialization. "
-                "Lower values reduce peak memory usage; higher values improve "
-                "throughput. Default: 500."
-            ),
-        )
-
     def handle(self, *args, **options) -> None:
         self.target = Path(options["target"]).resolve()
         self.split_manifest: bool = options["split_manifest"]
@@ -232,7 +200,6 @@ class Command(CryptMixin, BaseCommand):
         self.data_only: bool = options["data_only"]
         self.no_progress_bar: bool = options["no_progress_bar"]
         self.passphrase: str | None = options.get("passphrase")
-        self.batch_size: int = options["batch_size"]
 
         self.files_in_export_dir: set[Path] = set()
         self.exported_files: set[str] = set()
@@ -327,13 +294,8 @@ class Command(CryptMixin, BaseCommand):
 
             # Build an overall manifest
             for key, object_query in manifest_key_to_object_query.items():
-                manifest_dict[key] = list(
-                    chain.from_iterable(
-                        serialize_queryset_batched(
-                            object_query,
-                            batch_size=self.batch_size,
-                        ),
-                    ),
+                manifest_dict[key] = json.loads(
+                    serializers.serialize("json", object_query),
                 )
 
             self.encrypt_secret_fields(manifest_dict)
@@ -550,24 +512,14 @@ class Command(CryptMixin, BaseCommand):
             self.files_in_export_dir.remove(target)
             if self.compare_json:
                 target_checksum = hashlib.md5(target.read_bytes()).hexdigest()
-                src_str = json.dumps(
-                    content,
-                    cls=DjangoJSONEncoder,
-                    indent=2,
-                    ensure_ascii=False,
-                )
+                src_str = json.dumps(content, indent=2, ensure_ascii=False)
                 src_checksum = hashlib.md5(src_str.encode("utf-8")).hexdigest()
                 if src_checksum == target_checksum:
                     perform_write = False
 
         if perform_write:
             target.write_text(
-                json.dumps(
-                    content,
-                    cls=DjangoJSONEncoder,
-                    indent=2,
-                    ensure_ascii=False,
-                ),
+                json.dumps(content, indent=2, ensure_ascii=False),
                 encoding="utf-8",
             )
 

src/documents/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.11 on 2026-03-03 16:27
+# Generated by Django 5.2.7 on 2026-01-15 22:08
 
 import datetime
 
@@ -21,207 +21,6 @@ class Migration(migrations.Migration):
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
-    replaces = [
-        ("documents", "0001_initial"),
-        ("documents", "0002_auto_20151226_1316"),
-        ("documents", "0003_sender"),
-        ("documents", "0004_auto_20160114_1844"),
-        (
-            "documents",
-            "0004_auto_20160114_1844_squashed_0011_auto_20160303_1929",
-        ),
-        ("documents", "0005_auto_20160123_0313"),
-        ("documents", "0006_auto_20160123_0430"),
-        ("documents", "0007_auto_20160126_2114"),
-        ("documents", "0008_document_file_type"),
-        ("documents", "0009_auto_20160214_0040"),
-        ("documents", "0010_log"),
-        ("documents", "0011_auto_20160303_1929"),
-        ("documents", "0012_auto_20160305_0040"),
-        ("documents", "0013_auto_20160325_2111"),
-        ("documents", "0014_document_checksum"),
-        ("documents", "0015_add_insensitive_to_match"),
-        (
-            "documents",
-            "0015_add_insensitive_to_match_squashed_0018_auto_20170715_1712",
-        ),
-        ("documents", "0016_auto_20170325_1558"),
-        ("documents", "0017_auto_20170512_0507"),
-        ("documents", "0018_auto_20170715_1712"),
-        ("documents", "0019_add_consumer_user"),
-        ("documents", "0020_document_added"),
-        ("documents", "0021_document_storage_type"),
-        ("documents", "0022_auto_20181007_1420"),
-        ("documents", "0023_document_current_filename"),
-        ("documents", "1000_update_paperless_all"),
-        ("documents", "1001_auto_20201109_1636"),
-        ("documents", "1002_auto_20201111_1105"),
-        ("documents", "1003_mime_types"),
-        ("documents", "1004_sanity_check_schedule"),
-        ("documents", "1005_checksums"),
-        ("documents", "1006_auto_20201208_2209"),
-        (
-            "documents",
-            "1006_auto_20201208_2209_squashed_1011_auto_20210101_2340",
-        ),
-        ("documents", "1007_savedview_savedviewfilterrule"),
-        ("documents", "1008_auto_20201216_1736"),
-        ("documents", "1009_auto_20201216_2005"),
-        ("documents", "1010_auto_20210101_2159"),
-        ("documents", "1011_auto_20210101_2340"),
-        ("documents", "1012_fix_archive_files"),
-        ("documents", "1013_migrate_tag_colour"),
-        ("documents", "1014_auto_20210228_1614"),
-        ("documents", "1015_remove_null_characters"),
-        ("documents", "1016_auto_20210317_1351"),
-        (
-            "documents",
-            "1016_auto_20210317_1351_squashed_1020_merge_20220518_1839",
-        ),
-        ("documents", "1017_alter_savedviewfilterrule_rule_type"),
-        ("documents", "1018_alter_savedviewfilterrule_value"),
-        ("documents", "1019_storagepath_document_storage_path"),
-        ("documents", "1019_uisettings"),
-        ("documents", "1020_merge_20220518_1839"),
-        ("documents", "1021_webp_thumbnail_conversion"),
-        ("documents", "1022_paperlesstask"),
-        (
-            "documents",
-            "1022_paperlesstask_squashed_1036_alter_savedviewfilterrule_rule_type",
-        ),
-        ("documents", "1023_add_comments"),
-        ("documents", "1024_document_original_filename"),
-        ("documents", "1025_alter_savedviewfilterrule_rule_type"),
-        ("documents", "1026_transition_to_celery"),
-        (
-            "documents",
-            "1027_remove_paperlesstask_attempted_task_and_more",
-        ),
-        (
-            "documents",
-            "1028_remove_paperlesstask_task_args_and_more",
-        ),
-        ("documents", "1029_alter_document_archive_serial_number"),
-        ("documents", "1030_alter_paperlesstask_task_file_name"),
-        (
-            "documents",
-            "1031_remove_savedview_user_correspondent_owner_and_more",
-        ),
-        (
-            "documents",
-            "1032_alter_correspondent_matching_algorithm_and_more",
-        ),
-        (
-            "documents",
-            "1033_alter_documenttype_options_alter_tag_options_and_more",
-        ),
-        ("documents", "1034_alter_savedviewfilterrule_rule_type"),
-        ("documents", "1035_rename_comment_note"),
-        ("documents", "1036_alter_savedviewfilterrule_rule_type"),
-        ("documents", "1037_webp_encrypted_thumbnail_conversion"),
-        ("documents", "1038_sharelink"),
-        ("documents", "1039_consumptiontemplate"),
-        (
-            "documents",
-            "1040_customfield_customfieldinstance_and_more",
-        ),
-        ("documents", "1041_alter_consumptiontemplate_sources"),
-        (
-            "documents",
-            "1042_consumptiontemplate_assign_custom_fields_and_more",
-        ),
-        ("documents", "1043_alter_savedviewfilterrule_rule_type"),
-        (
-            "documents",
-            "1044_workflow_workflowaction_workflowtrigger_and_more",
-        ),
-        (
-            "documents",
-            "1045_alter_customfieldinstance_value_monetary",
-        ),
-        (
-            "documents",
-            "1045_alter_customfieldinstance_value_monetary_squashed_1049_document_deleted_at_document_restored_at",
-        ),
-        (
-            "documents",
-            "1046_workflowaction_remove_all_correspondents_and_more",
-        ),
-        ("documents", "1047_savedview_display_mode_and_more"),
-        ("documents", "1048_alter_savedviewfilterrule_rule_type"),
-        (
-            "documents",
-            "1049_document_deleted_at_document_restored_at",
-        ),
-        ("documents", "1050_customfield_extra_data_and_more"),
-        (
-            "documents",
-            "1051_alter_correspondent_owner_alter_document_owner_and_more",
-        ),
-        ("documents", "1052_document_transaction_id"),
-        ("documents", "1053_document_page_count"),
-        (
-            "documents",
-            "1054_customfieldinstance_value_monetary_amount_and_more",
-        ),
-        ("documents", "1055_alter_storagepath_path"),
-        (
-            "documents",
-            "1056_customfieldinstance_deleted_at_and_more",
-        ),
-        ("documents", "1057_paperlesstask_owner"),
-        (
-            "documents",
-            "1058_workflowtrigger_schedule_date_custom_field_and_more",
-        ),
-        (
-            "documents",
-            "1059_workflowactionemail_workflowactionwebhook_and_more",
-        ),
-        (
-            "documents",
-            "1060_alter_customfieldinstance_value_select",
-        ),
-        ("documents", "1061_workflowactionwebhook_as_json"),
-        ("documents", "1062_alter_savedviewfilterrule_rule_type"),
-        (
-            "documents",
-            "1063_paperlesstask_type_alter_paperlesstask_task_name_and_more",
-        ),
-        ("documents", "1064_delete_log"),
-        (
-            "documents",
-            "1065_workflowaction_assign_custom_fields_values",
-        ),
-        (
-            "documents",
-            "1066_alter_workflowtrigger_schedule_offset_days",
-        ),
-        ("documents", "1067_alter_document_created"),
-        ("documents", "1068_alter_document_created"),
-        (
-            "documents",
-            "1069_workflowtrigger_filter_has_storage_path_and_more",
-        ),
-        (
-            "documents",
-            "1070_customfieldinstance_value_long_text_and_more",
-        ),
-        (
-            "documents",
-            "1071_tag_tn_ancestors_count_tag_tn_ancestors_pks_and_more",
-        ),
-        (
-            "documents",
-            "1072_workflowtrigger_filter_custom_field_query_and_more",
-        ),
-        ("documents", "1073_migrate_workflow_title_jinja"),
-        (
-            "documents",
-            "1074_workflowrun_deleted_at_workflowrun_restored_at_and_more",
-        ),
-    ]
-
     operations = [
         migrations.CreateModel(
             name="WorkflowActionEmail",
@@ -386,6 +185,70 @@ class Migration(migrations.Migration):
                 "abstract": False,
             },
         ),
+        migrations.CreateModel(
+            name="CustomField",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        db_index=True,
+                        default=django.utils.timezone.now,
+                        editable=False,
+                        verbose_name="created",
+                    ),
+                ),
+                ("name", models.CharField(max_length=128)),
+                (
+                    "data_type",
+                    models.CharField(
+                        choices=[
+                            ("string", "String"),
+                            ("url", "URL"),
+                            ("date", "Date"),
+                            ("boolean", "Boolean"),
+                            ("integer", "Integer"),
+                            ("float", "Float"),
+                            ("monetary", "Monetary"),
+                            ("documentlink", "Document Link"),
+                            ("select", "Select"),
+                            ("longtext", "Long Text"),
+                        ],
+                        editable=False,
+                        max_length=50,
+                        verbose_name="data type",
+                    ),
+                ),
+                (
+                    "extra_data",
+                    models.JSONField(
+                        blank=True,
+                        help_text="Extra data for the custom field, such as select options",
+                        null=True,
+                        verbose_name="extra data",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "custom field",
+                "verbose_name_plural": "custom fields",
+                "ordering": ("created",),
+                "constraints": [
+                    models.UniqueConstraint(
+                        fields=("name",),
+                        name="documents_customfield_unique_name",
+                    ),
+                ],
+            },
+        ),
         migrations.CreateModel(
             name="DocumentType",
             fields=[
@@ -870,6 +733,17 @@ class Migration(migrations.Migration):
                         verbose_name="correspondent",
                     ),
                 ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        blank=True,
+                        default=None,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="owner",
+                    ),
+                ),
                 (
                     "document_type",
                     models.ForeignKey(
@@ -893,14 +767,12 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 (
-                    "owner",
-                    models.ForeignKey(
+                    "tags",
+                    models.ManyToManyField(
                         blank=True,
-                        default=None,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="owner",
+                        related_name="documents",
+                        to="documents.tag",
+                        verbose_name="tags",
                     ),
                 ),
             ],
@@ -910,140 +782,6 @@ class Migration(migrations.Migration):
                 "ordering": ("-created",),
             },
         ),
-        migrations.AddField(
-            model_name="document",
-            name="tags",
-            field=models.ManyToManyField(
-                blank=True,
-                related_name="documents",
-                to="documents.tag",
-                verbose_name="tags",
-            ),
-        ),
-        migrations.CreateModel(
-            name="Note",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("deleted_at", models.DateTimeField(blank=True, null=True)),
-                ("restored_at", models.DateTimeField(blank=True, null=True)),
-                ("transaction_id", models.UUIDField(blank=True, null=True)),
-                (
-                    "note",
-                    models.TextField(
-                        blank=True,
-                        help_text="Note for the document",
-                        verbose_name="content",
-                    ),
-                ),
-                (
-                    "created",
-                    models.DateTimeField(
-                        db_index=True,
-                        default=django.utils.timezone.now,
-                        verbose_name="created",
-                    ),
-                ),
-                (
-                    "document",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="notes",
-                        to="documents.document",
-                        verbose_name="document",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="notes",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="user",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "note",
-                "verbose_name_plural": "notes",
-                "ordering": ("created",),
-            },
-        ),
-        migrations.CreateModel(
-            name="CustomField",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "created",
-                    models.DateTimeField(
-                        db_index=True,
-                        default=django.utils.timezone.now,
-                        editable=False,
-                        verbose_name="created",
-                    ),
-                ),
-                ("name", models.CharField(max_length=128)),
-                (
-                    "data_type",
-                    models.CharField(
-                        choices=[
-                            ("string", "String"),
-                            ("url", "URL"),
-                            ("date", "Date"),
-                            ("boolean", "Boolean"),
-                            ("integer", "Integer"),
-                            ("float", "Float"),
-                            ("monetary", "Monetary"),
-                            ("documentlink", "Document Link"),
-                            ("select", "Select"),
-                            ("longtext", "Long Text"),
-                        ],
-                        editable=False,
-                        max_length=50,
-                        verbose_name="data type",
-                    ),
-                ),
-                (
-                    "extra_data",
-                    models.JSONField(
-                        blank=True,
-                        help_text="Extra data for the custom field, such as select options",
-                        null=True,
-                        verbose_name="extra data",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "custom field",
-                "verbose_name_plural": "custom fields",
-                "ordering": ("created",),
-                "constraints": [
-                    models.UniqueConstraint(
-                        fields=("name",),
-                        name="documents_customfield_unique_name",
-                    ),
-                ],
-            },
-        ),
         migrations.CreateModel(
             name="CustomFieldInstance",
             fields=[
@@ -1142,6 +880,66 @@ class Migration(migrations.Migration):
                 "ordering": ("created",),
             },
         ),
+        migrations.CreateModel(
+            name="Note",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("deleted_at", models.DateTimeField(blank=True, null=True)),
+                ("restored_at", models.DateTimeField(blank=True, null=True)),
+                ("transaction_id", models.UUIDField(blank=True, null=True)),
+                (
+                    "note",
+                    models.TextField(
+                        blank=True,
+                        help_text="Note for the document",
+                        verbose_name="content",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        db_index=True,
+                        default=django.utils.timezone.now,
+                        verbose_name="created",
+                    ),
+                ),
+                (
+                    "document",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="notes",
+                        to="documents.document",
+                        verbose_name="document",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="notes",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="user",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "note",
+                "verbose_name_plural": "notes",
+                "ordering": ("created",),
+            },
+        ),
         migrations.CreateModel(
             name="PaperlessTask",
             fields=[
@@ -1188,6 +986,7 @@ class Migration(migrations.Migration):
                             ("train_classifier", "Train Classifier"),
                             ("check_sanity", "Check Sanity"),
                             ("index_optimize", "Index Optimize"),
+                            ("llmindex_update", "LLM Index Update"),
                         ],
                         help_text="Name of the task that was run",
                         max_length=255,
@@ -1581,7 +1380,6 @@ class Migration(migrations.Migration):
                         verbose_name="Workflow Action Type",
                     ),
                 ),
-                ("order", models.PositiveIntegerField(default=0, verbose_name="order")),
                 (
                     "assign_title",
                     models.TextField(

src/documents/migrations/0002_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.11 on 2026-03-03 16:27
+# Generated by Django 5.2.9 on 2026-01-20 18:46
 
 import django.db.models.deletion
 from django.db import migrations
@@ -9,14 +9,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("documents", "0001_squashed"),
-        ("paperless_mail", "0001_squashed"),
-    ]
-
-    # This migration needs a "replaces", but it doesn't matter which.
-    # Chose the last 2.20.x migration
-    replaces = [
-        ("documents", "1075_workflowaction_order"),
+        ("documents", "0001_initial"),
+        ("paperless_mail", "0001_initial"),
     ]
 
     operations = [

src/documents/migrations/0003_workflowaction_order.py

@@ -6,7 +6,7 @@ from django.db import models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("documents", "0002_squashed"),
+        ("documents", "0002_initial"),
     ]
 
     operations = [

src/documents/migrations/0014_alter_paperlesstask_task_name.py

@@ -1,30 +0,0 @@
-# Generated by Django 5.2.11 on 2026-03-03 16:42
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("documents", "0013_document_root_document"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="paperlesstask",
-            name="task_name",
-            field=models.CharField(
-                choices=[
-                    ("consume_file", "Consume File"),
-                    ("train_classifier", "Train Classifier"),
-                    ("check_sanity", "Check Sanity"),
-                    ("index_optimize", "Index Optimize"),
-                    ("llmindex_update", "LLM Index Update"),
-                ],
-                help_text="Name of the task that was run",
-                max_length=255,
-                null=True,
-                verbose_name="Task Name",
-            ),
-        ),
-    ]

src/documents/profiling.py

@@ -1,71 +0,0 @@
-"""
-Temporary profiling utilities for comparing implementations.
-
-Usage in a management command or shell::
-
-    from documents.profiling import profile_block
-
-    with profile_block("new check_sanity"):
-        messages = check_sanity()
-
-    with profile_block("old check_sanity"):
-        messages = check_sanity_old()
-
-Drop this file when done.
-"""
-
-from __future__ import annotations
-
-import tracemalloc
-from contextlib import contextmanager
-from time import perf_counter
-from typing import TYPE_CHECKING
-
-from django.db import connection
-from django.db import reset_queries
-from django.test.utils import override_settings
-
-if TYPE_CHECKING:
-    from collections.abc import Generator
-
-
-@contextmanager
-def profile_block(label: str = "block") -> Generator[None, None, None]:
-    """Profile memory, wall time, and DB queries for a code block.
-
-    Prints a summary to stdout on exit. Requires no external packages.
-    Enables DEBUG temporarily to capture Django's query log.
-    """
-    tracemalloc.start()
-    snapshot_before = tracemalloc.take_snapshot()
-
-    with override_settings(DEBUG=True):
-        reset_queries()
-        start = perf_counter()
-
-        yield
-
-        elapsed = perf_counter() - start
-        queries = list(connection.queries)
-
-    snapshot_after = tracemalloc.take_snapshot()
-    _, peak = tracemalloc.get_traced_memory()
-    tracemalloc.stop()
-
-    # Compare snapshots for top allocations
-    stats = snapshot_after.compare_to(snapshot_before, "lineno")
-
-    query_time = sum(float(q["time"]) for q in queries)
-    mem_diff = sum(s.size_diff for s in stats)
-
-    print(f"\n{'=' * 60}")  # noqa: T201
-    print(f"  Profile: {label}")  # noqa: T201
-    print(f"{'=' * 60}")  # noqa: T201
-    print(f"  Wall time:    {elapsed:.4f}s")  # noqa: T201
-    print(f"  Queries:      {len(queries)} ({query_time:.4f}s)")  # noqa: T201
-    print(f"  Memory delta: {mem_diff / 1024:.1f} KiB")  # noqa: T201
-    print(f"  Peak memory:  {peak / 1024:.1f} KiB")  # noqa: T201
-    print("\n  Top 5 allocations:")  # noqa: T201
-    for stat in stats[:5]:
-        print(f"    {stat}")  # noqa: T201
-    print(f"{'=' * 60}\n")  # noqa: T201

src/documents/serialisers.py

@@ -1724,6 +1724,15 @@ class BulkEditSerializer(
         except ValueError:
             raise serializers.ValidationError("invalid rotation degrees")
 
+    def _validate_source_mode(self, parameters) -> None:
+        source_mode = parameters.get(
+            "source_mode",
+            bulk_edit.SourceModeChoices.LATEST_VERSION,
+        )
+        if source_mode not in bulk_edit.SourceModeChoices.__dict__.values():
+            raise serializers.ValidationError("Invalid source_mode")
+        parameters["source_mode"] = source_mode
+
     def _validate_parameters_split(self, parameters) -> None:
         if "pages" not in parameters:
             raise serializers.ValidationError("pages not specified")
@@ -1824,6 +1833,9 @@ class BulkEditSerializer(
         method = attrs["method"]
         parameters = attrs["parameters"]
 
+        if "source_mode" in parameters:
+            self._validate_source_mode(parameters)
+
         if method == bulk_edit.set_correspondent:
             self._validate_parameters_correspondent(parameters)
         elif method == bulk_edit.set_document_type:

src/documents/tests/test_api_bulk_edit.py

@@ -1395,7 +1395,10 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
                 {
                     "documents": [self.doc2.id],
                     "method": "edit_pdf",
-                    "parameters": {"operations": [{"page": 1}]},
+                    "parameters": {
+                        "operations": [{"page": 1}],
+                        "source_mode": "explicit_selection",
+                    },
                 },
             ),
             content_type="application/json",
@@ -1407,6 +1410,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         args, kwargs = m.call_args
         self.assertCountEqual(args[0], [self.doc2.id])
         self.assertEqual(kwargs["operations"], [{"page": 1}])
+        self.assertEqual(kwargs["source_mode"], "explicit_selection")
         self.assertEqual(kwargs["user"], self.user)
 
     def test_edit_pdf_invalid_params(self) -> None:
@@ -1572,6 +1576,24 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
             response.content,
         )
 
+        # invalid source mode
+        response = self.client.post(
+            "/api/documents/bulk_edit/",
+            json.dumps(
+                {
+                    "documents": [self.doc2.id],
+                    "method": "edit_pdf",
+                    "parameters": {
+                        "operations": [{"page": 1}],
+                        "source_mode": "not_a_mode",
+                    },
+                },
+            ),
+            content_type="application/json",
+        )
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertIn(b"Invalid source_mode", response.content)
+
     @mock.patch("documents.serialisers.bulk_edit.edit_pdf")
     def test_edit_pdf_page_out_of_bounds(self, m) -> None:
         """

src/documents/tests/test_bulk_edit.py

@@ -405,7 +405,9 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
         self.assertTrue(Document.objects.filter(id=self.doc1.id).exists())
         self.assertFalse(Document.objects.filter(id=version.id).exists())
 
-    def test_get_root_and_current_doc_mapping(self) -> None:
+    def test_resolve_root_and_source_doc_latest_version_prefers_newest_version(
+        self,
+    ) -> None:
         version1 = Document.objects.create(
             checksum="B-v1",
             title="B version 1",
@@ -417,18 +419,14 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
             root_document=self.doc2,
         )
 
-        root_ids_by_doc_id = bulk_edit._get_root_ids_by_doc_id(
-            [self.doc2.id, version1.id, version2.id],
+        root_doc, source_doc = bulk_edit._resolve_root_and_source_doc(
+            self.doc2,
+            source_mode="latest_version",
         )
-        self.assertEqual(root_ids_by_doc_id[self.doc2.id], self.doc2.id)
-        self.assertEqual(root_ids_by_doc_id[version1.id], self.doc2.id)
-        self.assertEqual(root_ids_by_doc_id[version2.id], self.doc2.id)
 
-        root_docs, current_docs = bulk_edit._get_root_and_current_docs_by_root_id(
-            {self.doc2.id},
-        )
-        self.assertEqual(root_docs[self.doc2.id].id, self.doc2.id)
-        self.assertEqual(current_docs[self.doc2.id].id, version2.id)
+        self.assertEqual(root_doc.id, self.doc2.id)
+        self.assertEqual(source_doc.id, version2.id)
+        self.assertNotEqual(source_doc.id, version1.id)
 
     @mock.patch("documents.tasks.bulk_update_documents.delay")
     def test_set_permissions(self, m) -> None:
@@ -1041,6 +1039,34 @@ class TestPDFActions(DirectoriesMixin, TestCase):
             self.assertIsNotNone(overrides)
             self.assertEqual(result, "OK")
 
+    @mock.patch("documents.data_models.magic.from_file", return_value="application/pdf")
+    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("pikepdf.open")
+    def test_rotate_explicit_selection_uses_root_source_when_root_selected(
+        self,
+        mock_open,
+        mock_consume_delay,
+        mock_magic,
+    ):
+        Document.objects.create(
+            checksum="B-v1",
+            title="B version 1",
+            root_document=self.doc2,
+        )
+        fake_pdf = mock.MagicMock()
+        fake_pdf.pages = [mock.Mock()]
+        mock_open.return_value.__enter__.return_value = fake_pdf
+
+        result = bulk_edit.rotate(
+            [self.doc2.id],
+            90,
+            source_mode="explicit_selection",
+        )
+
+        self.assertEqual(result, "OK")
+        mock_open.assert_called_once_with(self.doc2.source_path)
+        mock_consume_delay.assert_called_once()
+
     @mock.patch("documents.tasks.consume_file.delay")
     @mock.patch("pikepdf.Pdf.save")
     @mock.patch("documents.data_models.magic.from_file", return_value="application/pdf")
@@ -1065,6 +1091,34 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         self.assertIsNotNone(overrides)
         self.assertEqual(result, "OK")
 
+    @mock.patch("documents.data_models.magic.from_file", return_value="application/pdf")
+    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("pikepdf.open")
+    def test_delete_pages_explicit_selection_uses_root_source_when_root_selected(
+        self,
+        mock_open,
+        mock_consume_delay,
+        mock_magic,
+    ):
+        Document.objects.create(
+            checksum="B-v1",
+            title="B version 1",
+            root_document=self.doc2,
+        )
+        fake_pdf = mock.MagicMock()
+        fake_pdf.pages = [mock.Mock(), mock.Mock()]
+        mock_open.return_value.__enter__.return_value = fake_pdf
+
+        result = bulk_edit.delete_pages(
+            [self.doc2.id],
+            [1],
+            source_mode="explicit_selection",
+        )
+
+        self.assertEqual(result, "OK")
+        mock_open.assert_called_once_with(self.doc2.source_path)
+        mock_consume_delay.assert_called_once()
+
     @mock.patch("documents.tasks.consume_file.delay")
     @mock.patch("pikepdf.Pdf.save")
     def test_delete_pages_with_error(self, mock_pdf_save, mock_consume_delay):
@@ -1213,6 +1267,40 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         self.assertTrue(str(consumable.original_file).endswith("_edited.pdf"))
         self.assertIsNotNone(overrides)
 
+    @mock.patch("documents.data_models.magic.from_file", return_value="application/pdf")
+    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("pikepdf.new")
+    @mock.patch("pikepdf.open")
+    def test_edit_pdf_explicit_selection_uses_root_source_when_root_selected(
+        self,
+        mock_open,
+        mock_new,
+        mock_consume_delay,
+        mock_magic,
+    ):
+        Document.objects.create(
+            checksum="B-v1",
+            title="B version 1",
+            root_document=self.doc2,
+        )
+        fake_pdf = mock.MagicMock()
+        fake_pdf.pages = [mock.Mock()]
+        mock_open.return_value.__enter__.return_value = fake_pdf
+        output_pdf = mock.MagicMock()
+        output_pdf.pages = []
+        mock_new.return_value = output_pdf
+
+        result = bulk_edit.edit_pdf(
+            [self.doc2.id],
+            operations=[{"page": 1}],
+            update_document=True,
+            source_mode="explicit_selection",
+        )
+
+        self.assertEqual(result, "OK")
+        mock_open.assert_called_once_with(self.doc2.source_path)
+        mock_consume_delay.assert_called_once()
+
     @mock.patch("documents.bulk_edit.group")
     @mock.patch("documents.tasks.consume_file.s")
     def test_edit_pdf_without_metadata(
@@ -1333,6 +1421,34 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         self.assertEqual(consumable.root_document_id, doc.id)
         self.assertIsNotNone(overrides)
 
+    @mock.patch("documents.data_models.magic.from_file", return_value="application/pdf")
+    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("pikepdf.open")
+    def test_remove_password_explicit_selection_uses_root_source_when_root_selected(
+        self,
+        mock_open,
+        mock_consume_delay,
+        mock_magic,
+    ) -> None:
+        Document.objects.create(
+            checksum="A-v1",
+            title="A version 1",
+            root_document=self.doc1,
+        )
+        fake_pdf = mock.MagicMock()
+        mock_open.return_value.__enter__.return_value = fake_pdf
+
+        result = bulk_edit.remove_password(
+            [self.doc1.id],
+            password="secret",
+            update_document=True,
+            source_mode="explicit_selection",
+        )
+
+        self.assertEqual(result, "OK")
+        mock_open.assert_called_once_with(self.doc1.source_path, password="secret")
+        mock_consume_delay.assert_called_once()
+
     @mock.patch("documents.bulk_edit.chord")
     @mock.patch("documents.bulk_edit.group")
     @mock.patch("documents.tasks.consume_file.s")

src/paperless/checks.py

@@ -204,61 +204,6 @@ def audit_log_check(app_configs, **kwargs):
     return result
 
 
-@register()
-def check_v3_minimum_upgrade_version(
-    app_configs: object,
-    **kwargs: object,
-) -> list[Error]:
-    """Enforce that upgrades to v3 must start from v2.20.9.
-
-    v3 squashes all prior migrations into 0001_squashed and 0002_squashed.
-    If a user skips v2.20.9, the data migration in 1075_workflowaction_order
-    never runs and the squash may apply schema changes against an incomplete
-    database state.
-    """
-    from django.db import DatabaseError
-    from django.db import OperationalError
-
-    try:
-        all_tables = connections["default"].introspection.table_names()
-
-        if "django_migrations" not in all_tables:
-            return []
-
-        with connections["default"].cursor() as cursor:
-            cursor.execute(
-                "SELECT name FROM django_migrations WHERE app = %s",
-                ["documents"],
-            )
-            applied: set[str] = {row[0] for row in cursor.fetchall()}
-
-        if not applied:
-            return []
-
-        # Already in a valid v3 state
-        if {"0001_squashed", "0002_squashed"} & applied:
-            return []
-
-        # On v2.20.9 exactly — squash will pick up cleanly from here
-        if "1075_workflowaction_order" in applied:
-            return []
-
-    except (DatabaseError, OperationalError):
-        return []
-
-    return [
-        Error(
-            "Cannot upgrade to Paperless-ngx v3 from this version.",
-            hint=(
-                "Upgrading to v3 can only be performed from v2.20.9."
-                "Please upgrade to v2.20.9, run migrations, then upgrade to v3."
-                "See https://docs.paperless-ngx.com/setup/#upgrading for details."
-            ),
-            id="paperless.E002",
-        ),
-    ]
-
-
 @register()
 def check_deprecated_db_settings(
     app_configs: object,

src/paperless/tests/test_checks.py

@@ -3,7 +3,6 @@ from pathlib import Path
 from unittest import mock
 
 import pytest
-from django.core.checks import Error
 from django.core.checks import Warning
 from django.test import TestCase
 from django.test import override_settings
@@ -14,7 +13,6 @@ from documents.tests.utils import FileSystemAssertsMixin
 from paperless.checks import audit_log_check
 from paperless.checks import binaries_check
 from paperless.checks import check_deprecated_db_settings
-from paperless.checks import check_v3_minimum_upgrade_version
 from paperless.checks import debug_mode_check
 from paperless.checks import paths_check
 from paperless.checks import settings_values_check
@@ -397,240 +395,3 @@ class TestDeprecatedDbSettings:
 
         assert len(result) == 1
         assert "PAPERLESS_DBSSLCERT" in result[0].msg
-
-
-class TestV3MinimumUpgradeVersionCheck:
-    """Test suite for check_v3_minimum_upgrade_version system check."""
-
-    @pytest.fixture
-    def build_conn_mock(self, mocker: MockerFixture):
-        """Factory fixture that builds a connections['default'] mock.
-
-        Usage::
-
-            conn = build_conn_mock(tables=["django_migrations"], applied=["1075_..."])
-        """
-
-        def _build(tables: list[str], applied: list[str]) -> mock.MagicMock:
-            conn = mocker.MagicMock()
-            conn.introspection.table_names.return_value = tables
-            cursor = conn.cursor.return_value.__enter__.return_value
-            cursor.fetchall.return_value = [(name,) for name in applied]
-            return conn
-
-        return _build
-
-    def test_no_migrations_table_fresh_install(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - No django_migrations table exists in the database
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - No errors are reported (fresh install, nothing to enforce)
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {"default": build_conn_mock([], [])},
-        )
-        assert check_v3_minimum_upgrade_version(None) == []
-
-    def test_no_documents_migrations_fresh_install(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - django_migrations table exists but has no documents app rows
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - No errors are reported (fresh install, nothing to enforce)
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {"default": build_conn_mock(["django_migrations"], [])},
-        )
-        assert check_v3_minimum_upgrade_version(None) == []
-
-    def test_v3_state_with_0001_squashed(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - 0001_squashed is recorded in django_migrations
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - No errors are reported (DB is already in a valid v3 state)
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {
-                "default": build_conn_mock(
-                    ["django_migrations"],
-                    ["0001_squashed", "0002_squashed", "0003_workflowaction_order"],
-                ),
-            },
-        )
-        assert check_v3_minimum_upgrade_version(None) == []
-
-    def test_v3_state_with_0002_squashed_only(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - Only 0002_squashed is recorded in django_migrations
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - No errors are reported (0002_squashed alone confirms a valid v3 state)
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {"default": build_conn_mock(["django_migrations"], ["0002_squashed"])},
-        )
-        assert check_v3_minimum_upgrade_version(None) == []
-
-    def test_v2_20_9_state_ready_to_upgrade(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - 1075_workflowaction_order (the last v2.20.9 migration) is in the DB
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - No errors are reported (squash will pick up cleanly from this state)
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {
-                "default": build_conn_mock(
-                    ["django_migrations"],
-                    [
-                        "1074_workflowrun_deleted_at_workflowrun_restored_at_and_more",
-                        "1075_workflowaction_order",
-                    ],
-                ),
-            },
-        )
-        assert check_v3_minimum_upgrade_version(None) == []
-
-    def test_v2_20_8_raises_error(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - 1074 (last v2.20.8 migration) is applied but 1075 is not
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - An Error with id paperless.E002 is returned
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {
-                "default": build_conn_mock(
-                    ["django_migrations"],
-                    ["1074_workflowrun_deleted_at_workflowrun_restored_at_and_more"],
-                ),
-            },
-        )
-        result = check_v3_minimum_upgrade_version(None)
-        assert len(result) == 1
-        assert isinstance(result[0], Error)
-        assert result[0].id == "paperless.E002"
-
-    def test_very_old_version_raises_error(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - Only old migrations (well below v2.20.9) are applied
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - An Error with id paperless.E002 is returned
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {
-                "default": build_conn_mock(
-                    ["django_migrations"],
-                    ["1000_update_paperless_all", "1022_paperlesstask"],
-                ),
-            },
-        )
-        result = check_v3_minimum_upgrade_version(None)
-        assert len(result) == 1
-        assert isinstance(result[0], Error)
-        assert result[0].id == "paperless.E002"
-
-    def test_error_hint_mentions_v2_20_9(
-        self,
-        mocker: MockerFixture,
-        build_conn_mock,
-    ) -> None:
-        """
-        GIVEN:
-            - DB is on an old v2 version (pre-v2.20.9)
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - The error hint explicitly references v2.20.9 so users know what to do
-        """
-        mocker.patch.dict(
-            "paperless.checks.connections",
-            {"default": build_conn_mock(["django_migrations"], ["1022_paperlesstask"])},
-        )
-        result = check_v3_minimum_upgrade_version(None)
-        assert len(result) == 1
-        assert "v2.20.9" in result[0].hint
-
-    def test_db_error_is_swallowed(self, mocker: MockerFixture) -> None:
-        """
-        GIVEN:
-            - A DatabaseError is raised when querying the DB
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - No exception propagates and an empty list is returned
-        """
-        from django.db import DatabaseError
-
-        conn = mocker.MagicMock()
-        conn.introspection.table_names.side_effect = DatabaseError("connection refused")
-        mocker.patch.dict("paperless.checks.connections", {"default": conn})
-        assert check_v3_minimum_upgrade_version(None) == []
-
-    def test_operational_error_is_swallowed(self, mocker: MockerFixture) -> None:
-        """
-        GIVEN:
-            - An OperationalError is raised when querying the DB
-        WHEN:
-            - The v3 upgrade check runs
-        THEN:
-            - No exception propagates and an empty list is returned
-        """
-        from django.db import OperationalError
-
-        conn = mocker.MagicMock()
-        conn.introspection.table_names.side_effect = OperationalError("DB unavailable")
-        mocker.patch.dict("paperless.checks.connections", {"default": conn})
-        assert check_v3_minimum_upgrade_version(None) == []

src/paperless_mail/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.11 on 2026-03-03 16:27
+# Generated by Django 5.2.9 on 2026-01-20 18:46
 
 import django.db.models.deletion
 import django.utils.timezone
@@ -15,50 +15,6 @@ class Migration(migrations.Migration):
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
-    replaces = [
-        ("paperless_mail", "0001_initial"),
-        ("paperless_mail", "0001_initial_squashed_0009_mailrule_assign_tags"),
-        ("paperless_mail", "0002_auto_20201117_1334"),
-        ("paperless_mail", "0003_auto_20201118_1940"),
-        ("paperless_mail", "0004_mailrule_order"),
-        ("paperless_mail", "0005_help_texts"),
-        ("paperless_mail", "0006_auto_20210101_2340"),
-        ("paperless_mail", "0007_auto_20210106_0138"),
-        ("paperless_mail", "0008_auto_20210516_0940"),
-        ("paperless_mail", "0009_alter_mailrule_action_alter_mailrule_folder"),
-        ("paperless_mail", "0009_mailrule_assign_tags"),
-        ("paperless_mail", "0010_auto_20220311_1602"),
-        ("paperless_mail", "0011_remove_mailrule_assign_tag"),
-        (
-            "paperless_mail",
-            "0011_remove_mailrule_assign_tag_squashed_0024_alter_mailrule_name_and_more",
-        ),
-        ("paperless_mail", "0012_alter_mailrule_assign_tags"),
-        ("paperless_mail", "0013_merge_20220412_1051"),
-        ("paperless_mail", "0014_alter_mailrule_action"),
-        ("paperless_mail", "0015_alter_mailrule_action"),
-        ("paperless_mail", "0016_mailrule_consumption_scope"),
-        ("paperless_mail", "0017_mailaccount_owner_mailrule_owner"),
-        ("paperless_mail", "0018_processedmail"),
-        ("paperless_mail", "0019_mailrule_filter_to"),
-        ("paperless_mail", "0020_mailaccount_is_token"),
-        ("paperless_mail", "0021_alter_mailaccount_password"),
-        ("paperless_mail", "0022_mailrule_assign_owner_from_rule_and_more"),
-        ("paperless_mail", "0023_remove_mailrule_filter_attachment_filename_and_more"),
-        ("paperless_mail", "0024_alter_mailrule_name_and_more"),
-        (
-            "paperless_mail",
-            "0025_alter_mailaccount_owner_alter_mailrule_owner_and_more",
-        ),
-        ("paperless_mail", "0026_mailrule_enabled"),
-        (
-            "paperless_mail",
-            "0027_mailaccount_expiration_mailaccount_account_type_and_more",
-        ),
-        ("paperless_mail", "0028_alter_mailaccount_password_and_more"),
-        ("paperless_mail", "0029_mailrule_pdf_layout"),
-    ]
-
     operations = [
         migrations.CreateModel(
             name="MailAccount",

src/paperless_mail/migrations/0002_optimize_integer_field_sizes.py

@@ -6,7 +6,7 @@ from django.db import models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("paperless_mail", "0001_squashed"),
+        ("paperless_mail", "0001_initial"),
     ]
 
     operations = [