diff --git a/src/backend/InvenTree/part/test_api.py b/src/backend/InvenTree/part/test_api.py index 7752e95dd4..21d85fc2f3 100644 --- a/src/backend/InvenTree/part/test_api.py +++ b/src/backend/InvenTree/part/test_api.py @@ -5,6 +5,7 @@ from datetime import datetime from decimal import Decimal from random import randint +from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.db import connection from django.test.utils import CaptureQueriesContext @@ -18,7 +19,7 @@ import build.models import company.models import order.models from build.status_codes import BuildStatus -from common.models import InvenTreeSetting, ParameterTemplate +from common.models import InvenTreeSetting, Note, ParameterTemplate from company.models import Company, SupplierPart from InvenTree.config import get_testfolder_dir from InvenTree.unit_test import InvenTreeAPIPerformanceTestCase, InvenTreeAPITestCase @@ -1639,6 +1640,14 @@ class PartCreationTests(PartAPITestBase): description=f'Test template {key} for duplication', ) + # Attach a note to the base part + Note.objects.create( + model_type=ContentType.objects.get_for_model(Part), + model_id=base_part.pk, + title='Duplication test note', + content='Some note content', + ) + for do_copy in [True, False]: response = self.post( reverse('api-part-list'), @@ -1664,7 +1673,7 @@ class PartCreationTests(PartAPITestBase): # Check new part self.assertEqual(part.bom_items.count(), 4 if do_copy else 0) - self.assertEqual(part.notes, base_part.notes if do_copy else None) + self.assertEqual(part.notes.count(), 1 if do_copy else 0) self.assertEqual(part.parameters.count(), 2 if do_copy else 0) self.assertEqual(part.test_templates.count(), 3 if do_copy else 0) diff --git a/src/frontend/src/forms/BuildForms.tsx b/src/frontend/src/forms/BuildForms.tsx index 39fa22579e..09c50d02e8 100644 --- a/src/frontend/src/forms/BuildForms.tsx +++ b/src/frontend/src/forms/BuildForms.tsx @@ -139,7 +139,8 @@ export function useBuildOrderFields({ duplicate: DuplicateField({ originalId: duplicateBuildId, extraFields: { - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }) }; diff --git a/src/frontend/src/forms/CompanyForms.tsx b/src/frontend/src/forms/CompanyForms.tsx index bfd2ede4cc..4323a6b200 100644 --- a/src/frontend/src/forms/CompanyForms.tsx +++ b/src/frontend/src/forms/CompanyForms.tsx @@ -101,7 +101,8 @@ export function useSupplierPartFields({ duplicate: DuplicateField({ originalId: duplicateSupplierPartId, extraFields: { - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }) }; @@ -146,7 +147,8 @@ export function useManufacturerPartFields({ duplicate: DuplicateField({ originalId: duplicateManufacturerPartId, extraFields: { - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }) }; @@ -191,7 +193,8 @@ export function companyFields({ duplicate: DuplicateField({ originalId: duplicateCompanyId, extraFields: { - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }) }; diff --git a/src/frontend/src/forms/PurchaseOrderForms.tsx b/src/frontend/src/forms/PurchaseOrderForms.tsx index 4776e668eb..07dd7f2738 100644 --- a/src/frontend/src/forms/PurchaseOrderForms.tsx +++ b/src/frontend/src/forms/PurchaseOrderForms.tsx @@ -322,7 +322,8 @@ export function usePurchaseOrderFields({ }, copy_lines: {}, copy_extra_lines: {}, - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }; } diff --git a/src/frontend/src/forms/ReturnOrderForms.tsx b/src/frontend/src/forms/ReturnOrderForms.tsx index 463e7cc60a..2110bc775e 100644 --- a/src/frontend/src/forms/ReturnOrderForms.tsx +++ b/src/frontend/src/forms/ReturnOrderForms.tsx @@ -89,7 +89,8 @@ export function useReturnOrderFields({ value: duplicateOrderId }, copy_extra_lines: {}, - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }; } diff --git a/src/frontend/src/forms/SalesOrderForms.tsx b/src/frontend/src/forms/SalesOrderForms.tsx index 90ec80c034..0fee8bb22c 100644 --- a/src/frontend/src/forms/SalesOrderForms.tsx +++ b/src/frontend/src/forms/SalesOrderForms.tsx @@ -103,7 +103,8 @@ export function useSalesOrderFields({ }, copy_lines: {}, copy_extra_lines: {}, - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }; } diff --git a/src/frontend/src/forms/TransferOrderForms.tsx b/src/frontend/src/forms/TransferOrderForms.tsx index a3945fbec5..8736459ac5 100644 --- a/src/frontend/src/forms/TransferOrderForms.tsx +++ b/src/frontend/src/forms/TransferOrderForms.tsx @@ -59,7 +59,8 @@ export function useTransferOrderFields({ value: duplicateOrderId }, copy_lines: {}, - copy_parameters: {} + copy_parameters: {}, + copy_notes: {} } }; }