Merge branch 'master' into custom-states

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

@@ -536,6 +536,7 @@ export default function StockDetail() {
 
   const editStockItemFields = useStockFields({
     create: false,
+    stockItem: stockitem,
     partId: stockitem.part
   });
 

src/frontend/src/tables/stock/StockItemTable.tsx

@@ -414,12 +414,15 @@ export function StockItemTable({
     };
   }, [table]);
 
-  const stockItemFields = useStockFields({ create: true, partId: params.part });
+  const newStockItemFields = useStockFields({
+    create: true,
+    partId: params.part
+  });
 
   const newStockItem = useCreateApiFormModal({
     url: ApiEndpoints.stock_item_list,
     title: t`Add Stock Item`,
-    fields: stockItemFields,
+    fields: newStockItemFields,
     initialData: {
       part: params.part,
       location: params.location