Merge branch 'dev' of https://github.com/FOSSASystems/InvenTree into dev

Author: mariavfossa

src/backend/InvenTree/stock/serializers.py

@@ -342,6 +342,7 @@ class Meta:
             'belongs_to',
             'build',
             'consumed_by',
+            'consumed_by_reference',
             'customer',
             'delete_on_deplete',
             'expiry_date',
@@ -652,6 +653,10 @@ def annotate_queryset(queryset):
         source='purchase_order.reference', read_only=True, allow_null=True
     )
 
+    consumed_by_reference = serializers.CharField(
+        source='consumed_by.reference', read_only=True, allow_null=True
+    )
+
     sales_order_reference = serializers.CharField(
         source='sales_order.reference', read_only=True, allow_null=True
     )
@@ -1660,8 +1665,8 @@ class Meta:
     test = serializers.CharField(
         required=False,
         allow_blank=True,
-        label=_('Test'),
-        help_text=_('Test information'),
+        label=_('Count'),
+        help_text=_('Count based on FIFO order'),
     )
 
     def validate(self, data):

src/frontend/src/forms/StockForms.tsx

@@ -989,7 +989,7 @@ function stockCountFields(items: any[]): ApiFormFieldSet {
       ]
     },
     notes: {},
-    test: {}  
+    test: {}
   };
 
   return fields;

src/frontend/src/locales/en/messages.po

@@ -318,6 +318,9 @@ msgstr "Companies"
 msgid "Project Code"
 msgstr "Project Code"
 
+msgid "Project"
+msgstr "Project"
+
 #: lib/enums/ModelInformation.tsx:153
 #: src/pages/Index/Settings/AdminCenter/Index.tsx:172
 msgid "Project Codes"

src/frontend/src/tables/Filter.tsx

@@ -354,6 +354,18 @@ export function ManufacturerFilter(): TableFilter {
   };
 }
 
+export function ConsumedFilter(): TableFilter {
+  return {
+    name: 'consumed_by',
+    label: t`Project`,
+    description: t`Filter by project who consumed the item`,
+    type: 'api',
+    apiUrl: apiUrl(ApiEndpoints.build_order_list),
+    model: ModelType.build,
+    modelRenderer: (instance: any) => instance.name,
+  };
+}
+
 export function SupplierFilter(): TableFilter {
   return {
     name: 'supplier',

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

@@ -36,6 +36,7 @@ import {
   IncludeVariantsFilter,
   IsSerializedFilter,
   ManufacturerFilter,
+  ConsumedFilter,
   SerialFilter,
   SerialGTEFilter,
   SerialLTEFilter,
@@ -99,8 +100,11 @@ function stockItemTableColumns({
     },
     {
       accessor: 'consumed_by',
-      title: t`Consumed by`,
-      defaultVisible: false
+      title: t`Project`,
+      defaultVisible: false,
+      render: (record: any) => {
+        return record.consumed_by_reference;
+      }
     },
     {
       accessor: 'SKU',
@@ -222,6 +226,7 @@ function stockItemTableFilters({
     IncludeVariantsFilter(),
     SupplierFilter(),
     ManufacturerFilter(),
+    ConsumedFilter(),
     {
       name: 'consumed',
       label: t`Consumed`,
@@ -410,6 +415,20 @@ export function StockItemTable({
     return: allowReturn
   });
 
+  const totalStockValue = useMemo(() => {
+    let total = 0;
+
+    for (const record of table.records) {
+      const price = record.purchase_price ?? 0;
+      const quantity = record.quantity ?? 0;
+
+      total += price * quantity;
+    }
+
+    return total;
+  }, [table.records]);
+  
+
   const tableActions = useMemo(() => {
     return [
       stockAdjustActions.dropdown,
@@ -431,14 +450,15 @@ export function StockItemTable({
         hidden={!allowAdd || !user.hasAddRole(UserRoles.stock)}
         tooltip={t`Add Stock Item`}
         onClick={() => newStockItem.open()}
-      />
+      />,
+      <p><b>Total Stock Value: { totalStockValue } €</b></p>,
     ];
   }, [
     user,
     allowAdd,
     table.hasSelectedRecords,
     table.selectedRecords,
-    stockAdjustActions.dropdown
+    table.records,
   ]);
 
   return (