From 12677ccf22d04ecd93295ada180306574b6dd7a4 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 7 Jun 2025 20:08:20 +1000 Subject: [PATCH] Add barcode actions for SalesOrderShipment (#9746) * Add barcode actions for SalesOrderShipment * Handle error on worker boot --- src/backend/InvenTree/InvenTree/tasks.py | 7 ++++++- src/frontend/src/pages/sales/SalesOrderShipmentDetail.tsx | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/backend/InvenTree/InvenTree/tasks.py b/src/backend/InvenTree/InvenTree/tasks.py index 5c39b8e083..bcde964fff 100644 --- a/src/backend/InvenTree/InvenTree/tasks.py +++ b/src/backend/InvenTree/InvenTree/tasks.py @@ -641,7 +641,12 @@ def check_for_migrations(force: bool = False, reload_registry: bool = True) -> b def set_pending_migrations(n: int): """Helper function to inform the user about pending migrations.""" logger.info('There are %s pending migrations', n) - set_global_setting('_PENDING_MIGRATIONS', n, None) + + try: + set_global_setting('_PENDING_MIGRATIONS', n, None) + except Exception: + # If the setting cannot be set, we just log a warning + logger.error('Could not clear _PENDING_MIGRATIONS flag') logger.info('Checking for pending database migrations') diff --git a/src/frontend/src/pages/sales/SalesOrderShipmentDetail.tsx b/src/frontend/src/pages/sales/SalesOrderShipmentDetail.tsx index 2908161abf..1a4e681e92 100644 --- a/src/frontend/src/pages/sales/SalesOrderShipmentDetail.tsx +++ b/src/frontend/src/pages/sales/SalesOrderShipmentDetail.tsx @@ -317,6 +317,7 @@ export default function SalesOrderShipmentDetail() { key='barcode' model={ModelType.salesordershipment} pk={shipment.pk} + hash={shipment?.barcode_hash} />,