assets/stylesheets/App.css

@@ -2306,12 +2306,3 @@ span.ant-skeleton-input.ant-skeleton-input-sm.text-skeleton {
   font-size: 18px;
   color: var(--color-primary);
 }
-
-.ant-table-wrapper .ant-table-cell,
-.ant-table-wrapper .ant-table-thead > tr > th,
-.ant-table-wrapper .ant-table-tbody > tr > th,
-.ant-table-wrapper .ant-table-tbody > tr > td,
-.ant-table-wrapper tfoot > tr > th,
-.ant-table-wrapper tfoot > tr > td {
-  padding: 12px 8px;
-}

src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx

@@ -87,7 +87,7 @@ const ShipmentInfo = () => {
     finishEdit: () => {
       objectFormRef?.current?.handleUpdate?.()
       return true
-    }
+    },
   }
 
   return (
@@ -196,7 +196,7 @@ const ShipmentInfo = () => {
                       visibleProperties={{
                         items: false
                       }}
-                      labelWidth='285px'
+                      labelWidth='175px'
                     />
                   </InfoCollapse>
                   <InfoCollapse
@@ -210,10 +210,7 @@ const ShipmentInfo = () => {
                   >
                     <ObjectTable
                       type='orderItem'
-                      masterFilter={{
+                      masterFilter={{ shipment: getModelByName('shipment').prefix + ':' + shipmentId }}
-                        shipment:
-                          getModelByName('shipment').prefix + ':' + shipmentId
-                      }}
                       visibleColumns={{
                         shipment: false,
                         order: false,
@@ -237,7 +234,7 @@ const ShipmentInfo = () => {
               indicator={<LoadingOutlined />}
             >
               <Card>
-                <NotesPanel _id={shipmentId} type='shipment' />
+              <NotesPanel _id={shipmentId} type='shipment' />
               </Card>
             </Spin>
           </InfoCollapse>
@@ -254,7 +251,10 @@ const ShipmentInfo = () => {
               <ObjectTable
                 type='auditLog'
                 masterFilter={{
-                  parent: getModelByName('shipment').prefix + ':' + shipmentId
+                    parent:
+                      getModelByName('shipment').prefix +
+                      ':' +
+                      shipmentId
                 }}
                 visibleColumns={{ _id: false, parent: false }}
               />

src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx

@@ -14,7 +14,6 @@ import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
 import StockAuditIcon from '../../../Icons/StockAuditIcon.jsx'
-import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
 import ObjectForm from '../../common/ObjectForm.jsx'
 import EditButtons from '../../common/EditButtons.jsx'
 import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx'
@@ -42,7 +41,6 @@ const StockAuditInfo = () => {
     {
       info: true,
       auditLines: true,
-      stockEvents: true,
       notes: true,
       auditLogs: false
     }
@@ -110,7 +108,6 @@ const StockAuditInfo = () => {
               items={[
                 { key: 'info', label: 'Stock Audit Information' },
                 { key: 'auditLines', label: 'Audit Lines' },
-                { key: 'stockEvents', label: 'Stock Events' },
                 { key: 'notes', label: 'Notes' },
                 { key: 'auditLogs', label: 'Audit Logs' }
               ]}
@@ -215,32 +212,6 @@ const StockAuditInfo = () => {
             </ObjectForm>
           </ActionHandler>
 
-          <InfoCollapse
-            title='Stock Events'
-            icon={<StockEventIcon />}
-            active={collapseState.stockEvents}
-            onToggle={(expanded) =>
-              updateCollapseState('stockEvents', expanded)
-            }
-            collapseKey='stockEvents'
-          >
-            {objectFormState.loading ? (
-              <InfoCollapsePlaceholder />
-            ) : (
-              <ObjectTable
-                type='stockEvent'
-                masterFilter={{
-                  owner:
-                    getModelByName('stockAudit').prefix + ':' + stockAuditId
-                }}
-                visibleColumns={{
-                  owner: false,
-                  'owner.type': false
-                }}
-              />
-            )}
-          </InfoCollapse>
-
           <InfoCollapse
             title='Notes'
             icon={<NoteIcon />}

src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx

@@ -12,10 +12,6 @@ import ViewButton from '../../common/ViewButton.jsx'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
-import StockAuditIcon from '../../../Icons/StockAuditIcon.jsx'
-import FilamentStockIcon from '../../../Icons/FilamentStockIcon.jsx'
-import PartStockIcon from '../../../Icons/PartStockIcon.jsx'
-import ProductStockIcon from '../../../Icons/ProductStockIcon.jsx'
 import ObjectForm from '../../common/ObjectForm.jsx'
 import EditButtons from '../../common/EditButtons.jsx'
 import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx'
@@ -44,10 +40,6 @@ const StockLocationInfo = () => {
     'StockLocationInfo',
     {
       info: true,
-      filamentStocks: true,
-      partStocks: true,
-      productStocks: true,
-      stockAudits: true,
       notes: true,
       auditLogs: false
     }
@@ -115,10 +107,6 @@ const StockLocationInfo = () => {
                 disabled={objectFormState.loading}
                 items={[
                   { key: 'info', label: 'Stock Location' },
-                  { key: 'filamentStocks', label: 'Filament Stocks' },
-                  { key: 'partStocks', label: 'Part Stocks' },
-                  { key: 'productStocks', label: 'Product Stocks' },
-                  { key: 'stockAudits', label: 'Stock Audits' },
                   { key: 'notes', label: 'Notes' },
                   { key: 'auditLogs', label: 'Audit Logs' }
                 ]}
@@ -205,118 +193,6 @@ const StockLocationInfo = () => {
               </InfoCollapse>
             </ActionHandler>
 
-            <InfoCollapse
-              title='Filament Stocks'
-              icon={<FilamentStockIcon />}
-              active={collapseState.filamentStocks}
-              onToggle={(expanded) =>
-                updateCollapseState('filamentStocks', expanded)
-              }
-              collapseKey='filamentStocks'
-            >
-              {objectFormState.loading ? (
-                <InfoCollapsePlaceholder />
-              ) : (
-                <ObjectTable
-                  type='filamentStock'
-                  masterFilter={{
-                    stockLocation:
-                      getModelByName('stockLocation').prefix +
-                      ':' +
-                      stockLocationId
-                  }}
-                  visibleColumns={{
-                    stockLocation: false,
-                    'stockLocation._id': false
-                  }}
-                />
-              )}
-            </InfoCollapse>
-
-            <InfoCollapse
-              title='Part Stocks'
-              icon={<PartStockIcon />}
-              active={collapseState.partStocks}
-              onToggle={(expanded) =>
-                updateCollapseState('partStocks', expanded)
-              }
-              collapseKey='partStocks'
-            >
-              {objectFormState.loading ? (
-                <InfoCollapsePlaceholder />
-              ) : (
-                <ObjectTable
-                  type='partStock'
-                  masterFilter={{
-                    stockLocation:
-                      getModelByName('stockLocation').prefix +
-                      ':' +
-                      stockLocationId
-                  }}
-                  visibleColumns={{
-                    stockLocation: false,
-                    'stockLocation._id': false
-                  }}
-                />
-              )}
-            </InfoCollapse>
-
-            <InfoCollapse
-              title='Product Stocks'
-              icon={<ProductStockIcon />}
-              active={collapseState.productStocks}
-              onToggle={(expanded) =>
-                updateCollapseState('productStocks', expanded)
-              }
-              collapseKey='productStocks'
-            >
-              {objectFormState.loading ? (
-                <InfoCollapsePlaceholder />
-              ) : (
-                <ObjectTable
-                  type='productStock'
-                  masterFilter={{
-                    stockLocation:
-                      getModelByName('stockLocation').prefix +
-                      ':' +
-                      stockLocationId
-                  }}
-                  visibleColumns={{
-                    stockLocation: false,
-                    'stockLocation._id': false
-                  }}
-                />
-              )}
-            </InfoCollapse>
-
-            <InfoCollapse
-              title='Stock Audits'
-              icon={<StockAuditIcon />}
-              active={collapseState.stockAudits}
-              onToggle={(expanded) =>
-                updateCollapseState('stockAudits', expanded)
-              }
-              collapseKey='stockAudits'
-            >
-              {objectFormState.loading ? (
-                <InfoCollapsePlaceholder />
-              ) : (
-                <ObjectTable
-                  type='stockAudit'
-                  masterFilter={{
-                    stockLocation:
-                      getModelByName('stockLocation').prefix +
-                      ':' +
-                      stockLocationId
-                  }}
-                  visibleColumns={{
-                    stockLocation: false,
-                    'stockLocation._id': false
-                  }}
-                />
-              )}
-            </InfoCollapse>
-
             <InfoCollapse
               title='Notes'
               icon={<NoteIcon />}

src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx

@@ -13,7 +13,6 @@ import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
 import StockTransferIcon from '../../../Icons/StockTransferIcon.jsx'
-import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
 import ObjectForm from '../../common/ObjectForm.jsx'
 import EditButtons from '../../common/EditButtons.jsx'
 import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx'
@@ -48,7 +47,6 @@ const StockTransferInfo = () => {
     {
       info: true,
       lines: true,
-      stockEvents: true,
       notes: true,
       auditLogs: false
     }
@@ -116,7 +114,6 @@ const StockTransferInfo = () => {
               items={[
                 { key: 'info', label: 'Transfer' },
                 { key: 'lines', label: 'Lines' },
-                { key: 'stockEvents', label: 'Stock Events' },
                 { key: 'notes', label: 'Notes' },
                 { key: 'auditLogs', label: 'Audit Logs' }
               ]}
@@ -223,34 +220,6 @@ const StockTransferInfo = () => {
             </ObjectForm>
           </ActionHandler>
 
-          <InfoCollapse
-            title='Stock Events'
-            icon={<StockEventIcon />}
-            active={collapseState.stockEvents}
-            onToggle={(expanded) =>
-              updateCollapseState('stockEvents', expanded)
-            }
-            collapseKey='stockEvents'
-          >
-            {objectFormState.loading ? (
-              <InfoCollapsePlaceholder />
-            ) : (
-              <ObjectTable
-                type='stockEvent'
-                masterFilter={{
-                  owner:
-                    getModelByName('stockTransfer').prefix +
-                    ':' +
-                    stockTransferId
-                }}
-                visibleColumns={{
-                  owner: false,
-                  'owner.type': false
-                }}
-              />
-            )}
-          </InfoCollapse>
-
           <InfoCollapse
             title='Notes'
             icon={<NoteIcon />}

src/components/Dashboard/Management/StockAuditLevels/StockAuditLevelInfo.jsx

@@ -10,7 +10,6 @@ import ViewButton from '../../common/ViewButton'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
 import StockAuditLevelIcon from '../../../Icons/StockAuditLevelIcon.jsx'
-import StockAuditIcon from '../../../Icons/StockAuditIcon.jsx'
 import ObjectForm from '../../common/ObjectForm'
 import EditButtons from '../../common/EditButtons'
 import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx'
@@ -37,7 +36,6 @@ const StockAuditLevelInfo = () => {
     {
       info: true,
       auditLines: true,
-      stockAudits: true,
       auditLogs: false
     }
   )
@@ -99,7 +97,6 @@ const StockAuditLevelInfo = () => {
               items={[
                 { key: 'info', label: 'Stock Audit Level Information' },
                 { key: 'auditLines', label: 'Audit Lines' },
-                { key: 'stockAudits', label: 'Stock Audits' },
                 { key: 'auditLogs', label: 'Audit Logs' }
               ]}
               visibleState={collapseState}
@@ -201,33 +198,6 @@ const StockAuditLevelInfo = () => {
               )}
             </ObjectForm>
           </ActionHandler>
-          <InfoCollapse
-            title='Stock Audits'
-            icon={<StockAuditIcon />}
-            active={collapseState.stockAudits}
-            onToggle={(expanded) =>
-              updateCollapseState('stockAudits', expanded)
-            }
-            collapseKey='stockAudits'
-          >
-            {objectFormState.loading ? (
-              <InfoCollapsePlaceholder />
-            ) : (
-              <ObjectTable
-                type='stockAudit'
-                masterFilter={{
-                  auditLevel:
-                    getModelByName('stockAuditLevel').prefix +
-                    ':' +
-                    stockAuditLevelId
-                }}
-                visibleColumns={{
-                  auditLevel: false,
-                  'auditLevel._id': false
-                }}
-              />
-            )}
-          </InfoCollapse>
           <InfoCollapse
             title='Audit Logs'
             icon={<AuditLogIcon />}

src/database/models/PurchaseOrder.js

@@ -133,7 +133,7 @@ export const PurchaseOrder = {
         return objectData?.state?.type != 'draft'
       },
       objectData: (objectData) => ({
-        order: { ...objectData },
+        order: { _id: objectData._id },
         orderType: 'purchaseOrder',
         syncAmount: 'itemCost'
       })
@@ -148,7 +148,7 @@ export const PurchaseOrder = {
       },
       objectData: (objectData) => ({
         orderType: 'purchaseOrder',
-        order: { ...objectData }
+        order: { _id: objectData._id }
       })
     },
     {
@@ -167,7 +167,7 @@ export const PurchaseOrder = {
       },
       objectData: (objectData) => ({
         orderType: 'purchaseOrder',
-        order: { ...objectData }
+        order: objectData
       })
     },
     {

src/database/models/StockAudit.js

@@ -35,7 +35,7 @@ export const StockAudit = {
       name: 'new',
       type: 'modal',
       pageName: 'list',
-      modalWidth: 700,
+      modalWidth: 800,
       label: 'New Stock Audit',
       icon: PlusIcon,
       content: (objectData, { onOk } = {}) => {

src/database/models/StockAuditLevel.js

@@ -32,7 +32,7 @@ export const StockAuditLevel = {
       name: 'new',
       type: 'modal',
       pageName: 'list',
-      modalWidth: 700,
+      modalWidth: 900,
       label: 'New Stock Audit Level',
       icon: PlusIcon,
       content: (objectData, { onOk } = {}) => {