Merge commit '47c6906a74f41eed5b56f4dc43ea0d4e20415237' into block-notes

CHANGELOG.md

@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- [#12071](https://github.com/inventree/InvenTree/pull/12071) removes the "review_needed" field on the StockItem model. Note that this field was never exposed to the API or any business logic, and is essentially a no-op field which is not used for anything. This field was removed to simplify the StockItem model and reduce confusion around its purpose.
 - [#11962](https://github.com/inventree/InvenTree/pull/11962) removes the "remote_image" field from the Part API endpoint, which (previously) allowed the user to specify a remote URL for an image to be downloaded and associated with the part. This field was removed due to security concerns around downloading images from arbitrary URLs. If you were using this field in an external client application, you will need to update your application to use the new "download_image_from_url" API endpoint instead.
 
 ## 1.3.0 - 2026-04-11

src/backend/InvenTree/InvenTree/conversion.py

@@ -114,6 +114,9 @@ def reload_unit_registry():
     reg.define('@alias degF = Fahrenheit')
     reg.define('@alias degK = Kelvin')
 
+    # Override R as ohm (pint defines R as an SI prefix by default)
+    reg.define('R = ohm')
+
     # Define some "standard" additional units
     reg.define('piece = 1')
     reg.define('each = 1 = ea')

src/backend/InvenTree/InvenTree/tests.py

@@ -293,6 +293,16 @@ class ConversionTest(TestCase):
             )
             self.assertAlmostEqual(output, expected, 12)
 
+        # Test that 'R' is interpreted as ohms
+        # Ref: https://github.com/inventree/InvenTree/issues/12063
+        r_tests = [('8R6', 8.6), ('10R', 10), ('4R7', 4.7), ('100R', 100)]
+
+        for val, expected in r_tests:
+            output = InvenTree.conversion.convert_physical_value(
+                val, 'ohm', strip_units=True
+            )
+            self.assertAlmostEqual(output, expected, 6)
+
     def test_scientific_notation(self):
         """Test that scientific notation is handled correctly."""
         tests = [

src/backend/InvenTree/stock/migrations/0123_remove_stockitem_review_needed.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.14 on 2026-06-02 06:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stock", "0122_alter_stockitem_creation_date"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="stockitem",
+            name="review_needed",
+        ),
+    ]

src/backend/InvenTree/stock/models.py

@@ -448,7 +448,6 @@ class StockItem(
         expiry_date: Expiry date of the StockItem (optional)
         stocktake_date: Date of last stocktake for this item
         stocktake_user: User that performed the most recent stocktake
-        review_needed: Flag if StockItem needs review
         delete_on_deplete: If True, StockItem will be deleted when the stock level gets to zero
         status: Status of this StockItem (ref: stock.status_codes.StockStatus)
         notes: Extra notes field
@@ -1238,8 +1237,6 @@ class StockItem(
         help_text=_('Date that this stock item was created'),
     )
 
-    review_needed = models.BooleanField(default=False)
-
     delete_on_deplete = models.BooleanField(
         default=default_delete_on_deplete,
         verbose_name=_('Delete on deplete'),

src/frontend/src/components/dashboard/widgets/OrderHistoryWidget.tsx

@@ -4,7 +4,7 @@ import { apiUrl } from '@lib/functions/Api';
 import { StylishText } from '@lib/index';
 import { t } from '@lingui/core/macro';
 import { BarChart } from '@mantine/charts';
-import { Stack } from '@mantine/core';
+import { Box, LoadingOverlay, Stack } from '@mantine/core';
 import { useDocumentVisibility } from '@mantine/hooks';
 import { useQuery } from '@tanstack/react-query';
 import dayjs from 'dayjs';
@@ -84,13 +84,17 @@ function OrderHistoryComponent({
   return (
     <Stack gap='xs'>
       <StylishText size='md'>{title}</StylishText>
-      <BarChart
-        h={200}
-        data={chartData}
-        dataKey='month'
-        series={[{ name: 'count', label: t`Completed`, color: 'blue.6' }]}
-        withYAxis={false}
-      />
+      <Box>
+        <LoadingOverlay visible={query.isLoading || query.isFetching} />
+        <BarChart
+          h={200}
+          data={chartData}
+          dataKey='month'
+          series={[{ name: 'count', label: t`Completed`, color: 'blue.6' }]}
+          withYAxis={false}
+          yAxisProps={{ domain: [0, 'auto'] }}
+        />
+      </Box>
     </Stack>
   );
 }

src/frontend/src/pages/stock/StockDetail.tsx

@@ -122,6 +122,13 @@ export default function StockDetail() {
     }
   });
 
+  const { instance: part, instanceQuery: partQuery } = useInstance({
+    endpoint: ApiEndpoints.part_list,
+    pk: stockitem?.part,
+    hasPrimaryKey: true,
+    defaultValue: {}
+  });
+
   const { instance: serialNumbers, instanceQuery: serialNumbersQuery } =
     useInstance({
       endpoint: ApiEndpoints.stock_serial_info,
@@ -884,9 +891,8 @@ export default function StockDetail() {
       serial != '' &&
       stockitem.quantity == 1;
 
-    const canConvert =
-      !!stockitem.part_detail?.variant_of ||
-      !!stockitem.part_detail?.is_template;
+    // Allow variant conversion if the part is a variant, or if the part is a template
+    const canConvert = part?.variant_of || part?.is_template;
 
     return [
       <AdminButton model={ModelType.stockitem} id={stockitem.pk} />,
@@ -967,7 +973,7 @@ export default function StockDetail() {
         ]}
       />
     ];
-  }, [id, stockitem, user, stockAdjustActions.menuActions]);
+  }, [id, stockitem, part, user, stockAdjustActions.menuActions]);
 
   const stockBadges: ReactNode[] = useMemo(() => {
     let available = (stockitem?.quantity ?? 0) - (stockitem?.allocated ?? 0);