Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue6281

src/backend/InvenTree/InvenTree/api_version.py

@@ -119,7 +119,7 @@ v178 - 2024-02-29 : https://github.com/inventree/InvenTree/pull/6604
     - Adds "external_stock" field to the Part API endpoint
     - Adds "external_stock" field to the BomItem API endpoint
     - Adds "external_stock" field to the BuildLine API endpoint
-    - Stock quantites represented in the BuildLine API endpoint are now filtered by Build.source_location
+    - Stock quantities represented in the BuildLine API endpoint are now filtered by Build.source_location
 
 v177 - 2024-02-27 : https://github.com/inventree/InvenTree/pull/6581
     - Adds "subcategoies" count to PartCategoryTree serializer

src/backend/InvenTree/InvenTree/models.py

@@ -562,7 +562,7 @@ class InvenTreeTree(MetadataMixin, PluginValidationMixin, MPTTModel):
     """Provides an abstracted self-referencing tree model for data categories.
 
     - Each Category has one parent Category, which can be blank (for a top-level Category).
-    - Each Category can have zero-or-more child Categor(y/ies)
+    - Each Category can have zero-or-more child Category(y/ies)
 
     Attributes:
         name: brief name

src/backend/InvenTree/InvenTree/unit_test.py

@@ -240,7 +240,7 @@ class ExchangeRateMixin:
 
 
 class InvenTreeTestCase(ExchangeRateMixin, UserMixin, TestCase):
-    """Testcase with user setup buildin."""
+    """Testcase with user setup build in."""
 
     pass
 

src/backend/InvenTree/config_template.yaml

@@ -26,7 +26,7 @@ database:
 # Set debug to False to run in production mode, or use the environment variable INVENTREE_DEBUG
 debug: True
 
-# Set to False to disable the admin interfac, or use the environment variable INVENTREE_ADMIN_ENABLED
+# Set to False to disable the admin interface, or use the environment variable INVENTREE_ADMIN_ENABLED
 #admin_enabled: True
 
 # Set the admin URL, or use the environment variable INVENTREE_ADMIN_URL

src/backend/InvenTree/templates/js/translated/barcode.js

@@ -527,7 +527,7 @@ function barcodeCheckInStockItems(location_id, options={}) {
     var modal = options.modal || createNewModal();
     options.modal = modal;
 
-    // List of items we are going to checkin
+    // List of items we are going to check in
     var items = [];
 
     function reloadTable() {

src/backend/requirements-dev.txt

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile src/backend/requirements-dev.in -o src/backend/requirements-dev.txt --python-version=3.9 --no-strip-extras --generate-hashes
+#    uv pip compile src/backend/requirements-dev.in -o src/backend/requirements-dev.txt
 asgiref==3.8.1 \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590

src/backend/requirements.txt

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile src/backend/requirements.in -o src/backend/requirements.txt --python-version=3.9 --no-strip-extras --generate-hashes
+#    uv pip compile src/backend/requirements.in -o src/backend/requirements.txt
 asgiref==3.8.1 \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590

src/frontend/playwright.config.ts

@@ -3,7 +3,7 @@ import { defineConfig, devices } from '@playwright/test';
 export default defineConfig({
   testDir: './tests',
   fullyParallel: true,
-  timeout: 60000,
+  timeout: 90000,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 1 : 0,
   workers: process.env.CI ? 2 : undefined,

src/frontend/src/components/nav/Header.tsx

@@ -60,7 +60,7 @@ export function Header() {
             return null;
           });
         setNotificationCount(response?.data?.count ?? 0);
-        return response?.data;
+        return response?.data ?? null;
       } catch (error) {
         return error;
       }