@openmrs/esm-stock-management-app 3.0.1-pre.865 → 3.0.1-pre.868

package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json

@@ -22,7 +22,7 @@
       "auxiliaryFiles": [
         "10.js.map"
       ],
-      "hash": "17ed7dc17cd26a7c",
+      "hash": "f836cf8ad4ff0f4c",
       "childrenByOrder": {}
     },
     {
@@ -30,9 +30,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1236498,
+      "size": 1236590,
       "sizes": {
-        "javascript": 1236330,
+        "javascript": 1236422,
         "consume-shared": 168
       },
       "names": [],
@@ -46,7 +46,7 @@
       "auxiliaryFiles": [
         "14.js.map"
       ],
-      "hash": "d9d4b3c843b1cae5",
+      "hash": "19b4b932f121b45a",
       "childrenByOrder": {}
     },
     {
@@ -70,7 +70,7 @@
       "auxiliaryFiles": [
         "20.js.map"
       ],
-      "hash": "93c6b6b454c03f48",
+      "hash": "367205a6f567b46f",
       "childrenByOrder": {}
     },
     {
@@ -121,7 +121,7 @@
       "auxiliaryFiles": [
         "33.js.map"
       ],
-      "hash": "2bf9136ba0abb4d8",
+      "hash": "bc1c66c74f7d99bc",
       "childrenByOrder": {}
     },
     {
@@ -145,7 +145,7 @@
       "auxiliaryFiles": [
         "93.js.map"
       ],
-      "hash": "bcb04e259b07cb83",
+      "hash": "59300aec830930b9",
       "childrenByOrder": {}
     },
     {
@@ -169,7 +169,7 @@
       "auxiliaryFiles": [
         "119.js.map"
       ],
-      "hash": "9e0ece5b55d8b927",
+      "hash": "f95a0e820fecdb8a",
       "childrenByOrder": {}
     },
     {
@@ -220,7 +220,7 @@
       "auxiliaryFiles": [
         "152.js.map"
       ],
-      "hash": "00aaf1426ecbea5b",
+      "hash": "2bc6d405b90a5461",
       "childrenByOrder": {}
     },
     {
@@ -244,7 +244,7 @@
       "auxiliaryFiles": [
         "172.js.map"
       ],
-      "hash": "907bd3d7c926ba2e",
+      "hash": "88fa4b13d03dcc48",
       "childrenByOrder": {}
     },
     {
@@ -252,10 +252,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5613043,
+      "size": 5613135,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5591513,
+        "javascript": 5591605,
         "share-init": 210,
         "runtime": 21110
       },
@@ -272,7 +272,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "7949965be8675f6a",
+      "hash": "d80163440b2e0cba",
       "childrenByOrder": {}
     },
     {
@@ -296,7 +296,7 @@
       "auxiliaryFiles": [
         "235.js.map"
       ],
-      "hash": "189f7cff0509156c",
+      "hash": "97881173e5a445f1",
       "childrenByOrder": {}
     },
     {
@@ -342,7 +342,7 @@
       "auxiliaryFiles": [
         "290.js.map"
       ],
-      "hash": "e892a72c4d88b49a",
+      "hash": "6818119ba0c530d7",
       "childrenByOrder": {}
     },
     {
@@ -434,7 +434,7 @@
       "auxiliaryFiles": [
         "467.js.map"
       ],
-      "hash": "9971a8a2606f5583",
+      "hash": "eda382e4393e44d0",
       "childrenByOrder": {}
     },
     {
@@ -504,7 +504,7 @@
       "auxiliaryFiles": [
         "606.js.map"
       ],
-      "hash": "de055858f3d1b0f1",
+      "hash": "7f242bd71b29a774",
       "childrenByOrder": {}
     },
     {
@@ -552,7 +552,7 @@
       "auxiliaryFiles": [
         "642.js.map"
       ],
-      "hash": "0ff4c902817e1ac3",
+      "hash": "14b764133b014b57",
       "childrenByOrder": {}
     },
     {
@@ -597,7 +597,7 @@
       "auxiliaryFiles": [
         "675.js.map"
       ],
-      "hash": "56496672eaa23ddf",
+      "hash": "e24ac0c50e7eb51e",
       "childrenByOrder": {}
     },
     {
@@ -621,7 +621,7 @@
       "auxiliaryFiles": [
         "703.js.map"
       ],
-      "hash": "ee5dd12815fcdaae",
+      "hash": "c3acf7294d0d00f4",
       "childrenByOrder": {}
     },
     {
@@ -648,30 +648,6 @@
       "hash": "5abd4259c621a893",
       "childrenByOrder": {}
     },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 331228,
-      "sizes": {
-        "javascript": 331228
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-stock-management-app",
-        "main"
-      ],
-      "files": [
-        "727.js"
-      ],
-      "auxiliaryFiles": [
-        "727.js.map"
-      ],
-      "hash": "2cdbfbc571536659",
-      "childrenByOrder": {}
-    },
     {
       "rendered": true,
       "initial": false,
@@ -810,7 +786,7 @@
       "auxiliaryFiles": [
         "842.js.map"
       ],
-      "hash": "7f297458351c949a",
+      "hash": "bc573a8612cda582",
       "childrenByOrder": {}
     },
     {
@@ -839,6 +815,30 @@
       ],
       "hash": "0b62e4cea3cb991b",
       "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 338735,
+      "sizes": {
+        "javascript": 338735
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-stock-management-app",
+        "main"
+      ],
+      "files": [
+        "987.js"
+      ],
+      "auxiliaryFiles": [
+        "987.js.map"
+      ],
+      "hash": "72ba819e6017e783",
+      "childrenByOrder": {}
     }
   ]
 }

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.0.1-pre.865"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.0.1-pre.868"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "3.0.1-pre.865",
+  "version": "3.0.1-pre.868",
   "license": "MPL-2.0",
   "description": "Stock management microfrontend for OpenMRS 3.x",
   "browser": "dist/openmrs-esm-stock-management-app.js",

package/src/stock-operations/stock-operations-forms/input-components/quantity-uom-selector.component.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { ComboBox, InlineNotification, SkeletonText } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { type StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
@@ -15,9 +15,14 @@ const QtyUomSelector: React.FC<QtyUomSelectorProps> = ({ stockItemUuid, error, i
   const { t } = useTranslation();
   const { isLoading, error: stockItemError, item } = useStockItem(stockItemUuid);
   const initialSelectedItem = useMemo<StockItemPackagingUOMDTO | null>(
-    () => (item?.packagingUnits ?? []).find((u) => u.uuid === intiallvalue),
+    () => (item?.packagingUnits ?? []).find((u) => u.uuid === intiallvalue) ?? item?.packagingUnits?.[0],
     [item?.packagingUnits, intiallvalue],
   );
+  useEffect(() => {
+    if (initialSelectedItem) {
+      onValueChange?.(initialSelectedItem?.uuid);
+    }
+  }, [initialSelectedItem, onValueChange]);
 
   if (isLoading) return <SkeletonText role="progressbar" />;
 
@@ -38,7 +43,7 @@ const QtyUomSelector: React.FC<QtyUomSelectorProps> = ({ stockItemUuid, error, i
       invalidText={error}
       items={item?.packagingUnits ?? []}
       itemToString={(s: StockItemPackagingUOMDTO) =>
-        s.packagingUomName ? `${s?.packagingUomName} - ${s?.factor} ` : ''
+        s?.packagingUomName ? `${s?.packagingUomName} - ${s?.factor} ` : ''
       }
       name={'stockItemPackagingUOMUuid'}
       onChange={(data: { selectedItem?: StockItemPackagingUOMDTO }) => {

package/src/stock-operations/stock-operations-forms/input-components/unique-batch-no-entry-input.component.tsx

@@ -34,6 +34,7 @@ const UniqueBatchNoEntryInput: React.FC<UniqueBatchNoEntryInputProps> = ({
   useEffect(() => {
     if (batchNoAlreadyUsed) {
       setError(t('batchNumberAlreadyUsed', 'Batch number already used'));
+      onValueChange?.('');
     } else {
       setError(undefined);
       onValueChange?.(value);

package/src/stock-operations/stock-operations-forms/step2.test.tsx

@@ -41,6 +41,11 @@ jest.mock('../stock-operations.resource', () => ({
     isLoading: false,
     error: null,
   }),
+  useStockOperationAndItems: jest.fn().mockReturnValue({
+    items: { results: [] },
+    isLoading: false,
+    error: null,
+  }),
 }));
 
 jest.mock('../../core/components/overlay/hook', () => ({
@@ -88,6 +93,7 @@ jest.mock('react-hook-form', () => ({
     getValues: jest.fn(),
     setValue: jest.fn(),
     handleSubmit: jest.fn(),
+    trigger: jest.fn().mockReturnValue(true),
   }),
   useFormContext: jest.fn().mockReturnValue({
     watch: jest.fn(),
@@ -109,6 +115,7 @@ jest.mock('react-hook-form', () => ({
     getValues: jest.fn(),
     setValue: jest.fn(),
     handleSubmit: jest.fn(),
+    trigger: jest.fn().mockReturnValue(true),
   }),
   Controller: ({ render }) => render({ field: {}, fieldState: {} }),
   FormProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
@@ -354,6 +361,7 @@ describe('Stock Operation step 2 (stock operation items details)', () => {
       getValues: jest.fn(),
       setValue: jest.fn(),
       handleSubmit: jest.fn(),
+      trigger: jest.fn().mockReturnValue(true),
     } as unknown as UseFormReturn<BaseStockOperationItemFormData>);
 
     render(

package/src/stock-operations/stock-operations-forms/step3.test.tsx

@@ -75,6 +75,7 @@ jest.mock('react-hook-form', () => ({
     getValues: jest.fn(),
     setValue: jest.fn(),
     handleSubmit: jest.fn(),
+    trigger: jest.fn().mockReturnValue(true),
   }),
   useFormContext: jest.fn().mockReturnValue({
     watch: jest.fn(),
@@ -85,6 +86,7 @@ jest.mock('react-hook-form', () => ({
     getValues: jest.fn(),
     setValue: jest.fn(),
     handleSubmit: jest.fn(),
+    trigger: jest.fn().mockReturnValue(true),
   }),
   Controller: ({ render }) => render({ field: {}, fieldState: {} }),
   FormProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,

package/src/stock-operations/stock-operations-forms/steps/base-operation-details-form-step.tsx

@@ -9,9 +9,10 @@ import {
   TextArea,
   TextInput,
 } from '@carbon/react';
+import { ArrowRight } from '@carbon/react/icons';
 import { ErrorState } from '@openmrs/esm-framework';
 import React, { type ChangeEvent, type FC, useEffect, useMemo } from 'react';
-import { Controller, useFormContext, useFormState } from 'react-hook-form';
+import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { DATE_PICKER_CONTROL_FORMAT, DATE_PICKER_FORMAT, MAIN_STORE_LOCATION_TAG } from '../../../constants';
 import { type Party } from '../../../core/api/types/Party';
@@ -23,7 +24,6 @@ import useParties from '../hooks/useParties';
 import StockOperationReasonSelector from '../input-components/stock-operation-reason-selector.component';
 import UsersSelector from '../input-components/users-selector.component';
 import styles from '../stock-operation-form.scss';
-import { ArrowRight } from '@carbon/react/icons';
 
 type BaseOperationDetailsFormStepProps = {
   stockOperation?: StockOperationDTO;
@@ -51,6 +51,18 @@ const BaseOperationDetailsFormStep: FC<BaseOperationDetailsFormStepProps> = ({
     () => OperationType.STOCK_ISSUE_OPERATION_TYPE === stockOperationType.operationType,
     [stockOperationType],
   );
+  const handleNext = async () => {
+    const valid = await form.trigger([
+      'responsiblePersonUuid',
+      'operationDate',
+      'remarks',
+      'sourceUuid',
+      'destinationUuid',
+      'reasonUuid',
+      'responsiblePersonOther',
+    ]);
+    if (valid) onNext();
+  };
 
   // initialize location fields
   useEffect(() => {
@@ -142,7 +154,7 @@ const BaseOperationDetailsFormStep: FC<BaseOperationDetailsFormStepProps> = ({
             <ComboBox
               titleText={
                 isStockIssueOperation
-                  ? t('destination', 'destination')
+                  ? t('source', 'Source')
                   : stockOperationType?.hasDestination || stockOperation?.destinationUuid
                   ? t('from', 'From')
                   : t('location', 'Location')
@@ -155,7 +167,6 @@ const BaseOperationDetailsFormStep: FC<BaseOperationDetailsFormStepProps> = ({
               onChange={(data: { selectedItem: Party }) => {
                 field.onChange(data.selectedItem?.uuid);
               }}
-              initialSelectedItem={sourceParties.find((p) => p.uuid === field.value)}
               selectedItem={sourceParties.find((p) => p.uuid === field.value)}
               itemToString={(item?: Party) => (item && item?.name ? `${item?.name}` : '')}
               shouldFilterItem={() => true}
@@ -181,7 +192,7 @@ const BaseOperationDetailsFormStep: FC<BaseOperationDetailsFormStepProps> = ({
                 readOnly={field.disabled}
                 titleText={
                   isStockIssueOperation
-                    ? t('source', 'Source')
+                    ? t('destination', 'destination')
                     : stockOperationType?.hasSource || stockOperation?.atLocationUuid
                     ? t('to', 'To')
                     : t('location', 'Location')
@@ -193,7 +204,6 @@ const BaseOperationDetailsFormStep: FC<BaseOperationDetailsFormStepProps> = ({
                 onChange={(data: { selectedItem: Party }) => {
                   field.onChange(data.selectedItem?.uuid);
                 }}
-                initialSelectedItem={destinationParties.find((p) => p.uuid === field.value)}
                 selectedItem={destinationParties.find((p) => p.uuid === field.value)}
                 itemToString={(item?: Party) => (item && item?.name ? `${item?.name}` : '')}
                 shouldFilterItem={() => true}
@@ -240,7 +250,7 @@ const BaseOperationDetailsFormStep: FC<BaseOperationDetailsFormStepProps> = ({
       </Column>
       <div className={styles.btnSet}>
         {typeof onNext === 'function' && (
-          <Button kind="primary" onClick={onNext} role="button" renderIcon={ArrowRight}>
+          <Button kind="primary" onClick={handleNext} role="button" renderIcon={ArrowRight}>
             {t('next', 'Next')}
           </Button>
         )}

package/src/stock-operations/stock-operations-forms/steps/stock-operation-items-form-step.component.tsx

@@ -25,6 +25,7 @@ import StockOperationItemBatchNoCell from './stock-operation-item-batch-no-cell.
 import StockOperationItemCell from './stock-operation-item-cell.component';
 import StockoperationItemExpiryCell from './stock-operation-item-expiry-cell.component';
 import styles from './stock-operation-items-form-step.scc.scss';
+import { showSnackbar } from '@openmrs/esm-framework';
 
 type StockOperationItemsFormStepProps = {
   stockOperation?: StockOperationDTO;
@@ -104,13 +105,6 @@ const StockOperationItemsFormStep: React.FC<StockOperationItemsFormStepProps> =
     ];
   }, [operationTypePermision, t]);
 
-  const handleDeleteStockOperationItem = useCallback(
-    (item: BaseStockOperationItemFormData) => {
-      form.setValue('stockOperationItems', observableOperationItems.filter((i) => i.uuid !== item.uuid) as any);
-    },
-    [form, observableOperationItems],
-  );
-
   const tableRows = useMemo(() => {
     return observableOperationItems?.map((item, index) => {
       const {
@@ -181,6 +175,22 @@ const StockOperationItemsFormStep: React.FC<StockOperationItemsFormStepProps> =
     });
   }, [observableOperationItems, onLaunchItemsForm, stockOperationType, uniqueId]);
 
+  const handleNext = async () => {
+    const valid = await form.trigger(['stockOperationItems']);
+    if (valid) {
+      onNext();
+    } else {
+      showSnackbar({
+        kind: 'error',
+        title: 'Validation error',
+        subtitle:
+          observableOperationItems && observableOperationItems.length > 0
+            ? 'You must update batch infomation for items'
+            : 'You must add atleast one item',
+      });
+    }
+  };
+
   const headerTitle = t('stockoperationItems', 'Stock operation items');
 
   return (
@@ -239,7 +249,7 @@ const StockOperationItemsFormStep: React.FC<StockOperationItemsFormStepProps> =
         />
         <div className={styles.btnSet}>
           {typeof onNext === 'function' && (
-            <Button kind="primary" onClick={onNext} renderIcon={ArrowRight}>
+            <Button kind="primary" onClick={handleNext} renderIcon={ArrowRight}>
               {t('next', 'Next')}
             </Button>
           )}

package/src/stock-operations/stock-operations-forms/stock-item-form/stock-item-form.workspace.tsx

@@ -127,7 +127,9 @@ const StockItemForm: React.FC<StockItemFormProps> = ({ stockOperationType, stock
                     locale="en"
                     className={styles.datePickerInput}
                     dateFormat={DATE_PICKER_CONTROL_FORMAT}
-                    {...field}
+                    value={field.value}
+                    name={field.name}
+                    disabled={field.disabled}
                     onChange={([newDate]) => {
                       field.onChange(newDate);
                     }}
@@ -139,6 +141,7 @@ const StockItemForm: React.FC<StockItemFormProps> = ({ stockOperationType, stock
                       placeholder={DATE_PICKER_FORMAT}
                       labelText={t('expiriation', 'Expiration Date')}
                       invalid={error?.message}
+                      invalidText={error?.message}
                     />
                   </DatePicker>
                 )}

package/src/stock-operations/stock-operations-forms/stock-operation-form.component.tsx

@@ -26,9 +26,9 @@ import BaseOperationDetailsFormStep from './steps/base-operation-details-form-st
 import ReceivedItems from './steps/received-items.component';
 import StockOperationItemsFormStep from './steps/stock-operation-items-form-step.component';
 import StockOperationSubmissionFormStep from './steps/stock-operation-submission-form-step.component';
-import StockIssueFormInitializerWithRelatedRequisitionOperation from './stock-issue-form-initializer-with-related-requisition-operation.component';
 import StockItemForm, { type StockItemFormProps } from './stock-item-form/stock-item-form.workspace';
 import StockOperationStepper from './stock-operation-stepper/stock-operation-stepper.component';
+import { useStockOperationAndItems } from '../stock-operations.resource';
 
 /**
  * Props interface for the StockOperationForm component
@@ -72,6 +72,8 @@ const StockOperationForm: React.FC<StockOperationFormProps> = ({
     user: { uuid: defaultLoggedUserUuid },
   } = useSession();
   const { autoPopulateResponsiblePerson } = useConfig<ConfigObject>();
+  const { error, items: _stockOperation, isLoading } = useStockOperationAndItems(stockRequisitionUuid);
+
   const form = useForm<StockOperationItemDtoSchema>({
     defaultValues: {
       responsiblePersonUuid:
@@ -95,6 +97,23 @@ const StockOperationForm: React.FC<StockOperationFormProps> = ({
       destinationUuid: stockOperation?.destinationUuid ?? '',
     },
     mode: 'all',
+    values: stockRequisitionUuid
+      ? {
+          sourceUuid: _stockOperation?.destinationUuid,
+          destinationUuid: _stockOperation?.sourceUuid,
+          operationTypeUuid: stockOperationType?.uuid,
+          stockOperationItems: (_stockOperation?.stockOperationItems?.map((item) =>
+            pick(
+              { ...item, expiration: item?.expiration ? parseDate(item.expiration as any) : undefined },
+              stockOperationItemFormSchema.keyof().options,
+            ),
+          ) ?? []) as any,
+          requisitionStockOperationUuid: stockRequisitionUuid,
+          responsiblePersonUuid: _stockOperation?.responsiblePersonUuid,
+          responsiblePersonOther: _stockOperation?.responsiblePersonOther,
+          operationDate: _stockOperation?.operationDate ? parseDate(_stockOperation!.operationDate as any) : today(),
+        }
+      : undefined,
     resolver: zodResolver(formschema),
   });
   const [renderItemForm, setRenderItemForm] = useState(false);
@@ -137,7 +156,7 @@ const StockOperationForm: React.FC<StockOperationFormProps> = ({
             onNext={() => setSelectedIndex(1)}
           />
         ),
-        disabled: false,
+        disabled: !stockOperation,
       },
       {
         name: t('stockItems', 'Stock Items'),
@@ -150,7 +169,7 @@ const StockOperationForm: React.FC<StockOperationFormProps> = ({
             onLaunchItemsForm={handleLaunchStockItem}
           />
         ),
-        disabled: false,
+        disabled: !stockOperation,
       },
       {
         name: operationTypePermision?.requiresDispatchAcknowledgement ? 'Submit/Dispatch' : 'Submit/Complete',
@@ -163,7 +182,7 @@ const StockOperationForm: React.FC<StockOperationFormProps> = ({
             dismissWorkspace={closeWorkspace}
           />
         ),
-        disabled: false,
+        disabled: !stockOperation,
       },
     ].concat(
       showReceivedItems
@@ -171,7 +190,7 @@ const StockOperationForm: React.FC<StockOperationFormProps> = ({
             {
               name: t('receivedItems', 'Received Items'),
               component: <ReceivedItems stockOperation={stockOperation} onPrevious={() => setSelectedIndex(2)} />,
-              disabled: false,
+              disabled: !stockOperation,
             },
           ]
         : [],
@@ -218,14 +237,25 @@ const StockOperationForm: React.FC<StockOperationFormProps> = ({
     }
   }, [form.formState.errors]);
 
+  // Stock issue errors (while fetching related requisitio or if no supplied requisition)
+  useEffect(() => {
+    if (operationType === OperationType.STOCK_ISSUE_OPERATION_TYPE && !stockRequisitionUuid)
+      showSnackbar({
+        kind: 'error',
+        title: t('stockIssueError', 'StockIssue error'),
+        subtitle: t('relatedStockRequisitionRequired', 'Related stock requisition Required'),
+      });
+    if (error) {
+      showSnackbar({
+        kind: 'error',
+        title: t('stockIssueError', 'StockIssue error'),
+        subtitle: error?.message,
+      });
+    }
+  }, [stockRequisitionUuid, error, t, operationType]);
+
   return (
     <FormProvider {...form}>
-      {stockOperationType.operationType === OperationType.STOCK_ISSUE_OPERATION_TYPE && (
-        <StockIssueFormInitializerWithRelatedRequisitionOperation
-          stockRequisitionUuid={stockRequisitionUuid as string}
-          stockOperationType={stockOperationType}
-        />
-      )}
       {renderItemForm ? (
         <StockItemForm {...itemsFormProps} />
       ) : (

package/src/stock-operations/stock-operations.resource.ts

@@ -82,9 +82,9 @@ export function getStockOperation(id: string): Promise<FetchResponse<StockOperat
 }
 
 // getStockOperationAndItems
-export function useStockOperationAndItems(id: string) {
+export function useStockOperationAndItems(id = '') {
   const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${id}?v=full`;
-  const { data, error, isLoading } = useSWR<{ data: StockOperationDTO }, Error>(apiUrl, openmrsFetch);
+  const { data, error, isLoading } = useSWR<{ data: StockOperationDTO }, Error>(id ? apiUrl : null, openmrsFetch);
   return {
     items: data?.data,
     isLoading,

package/src/stock-operations/validation-schema.ts

@@ -143,6 +143,18 @@ export const getStockOperationItemFormSchema = (operationType: OperationType) =>
         purchasePrice: true,
       });
     case OperationType.ADJUSTMENT_OPERATION_TYPE:
+      return baseStockOperationItemSchema
+        .omit({
+          batchNo: true,
+          expiration: true,
+          purchasePrice: true,
+        })
+        .extend({
+          // Override quantity to allow negative values for negative adjustment operation
+          quantity: z.coerce.number().refine((value) => value !== 0, {
+            message: 'Quantity cannot be zero.',
+          }),
+        });
     case OperationType.DISPOSED_OPERATION_TYPE:
     case OperationType.RETURN_OPERATION_TYPE:
     case OperationType.STOCK_ISSUE_OPERATION_TYPE: