Fix merge conflicts

distro/configuration/privileges/privileges_stockmanagement.csv

@@ -0,0 +1,18 @@
+Uuid,Privilege name,Description,_order:1000
+cc9b0e0c-ecaf-479d-9d7c-3071c0c1bff2,App: stockmanagement.dashboard,Able to view stock management application dashboard
+ffeb0885-293e-433b-a279-8de6f98026b2,App: stockmanagement.stockItems,Able to view stock items
+4a61b6db-03dd-43f2-969c-17dfa66ad41e,Task: stockmanagement.stockItems.mutate,Able to create and update stock items
+83871f7a-467e-11ed-8109-00155dcc3fc0,Task: stockmanagement.stockItems.dispense.qty,Able to view stock item quantities at dispensing locations
+6292e17d-4694-11ed-8109-00155dcc3fc0,Task: stockmanagement.stockItems.dispense,Able to dispense stock items
+a627c62a-efa1-4ac9-88e8-b816facfce0a,App: stockmanagement.userRoleScopes,Able to view stock management user role scope
+cc5a7ba4-ee34-4c2f-98c7-ae65cacf0094,Task: stockmanagement.userRoleScopes.mutate,Able to create and update user role scopes
+5d0d6f61-2188-11ed-9dff-507b9dea1806,App: stockmanagement.stockoperations,Able to view stock operations
+63b8815f-2188-11ed-9dff-507b9dea1806,Task: stockmanagement.stockoperations.mutate,Able to create and update stock operations
+7aef02ad-2189-11ed-9dff-507b9dea1806,Task: stockmanagement.stockoperations.approve,Able to aprove stock operations
+fd391f90-3335-11ed-a667-507b9dea1806,Task: stockmanagement.stockoperations.receiveitems,Able to receive dispatched stock items
+4fec772e-262a-11ed-a544-507b9dea1806,App: stockmanagement.stockSources,Able to view stock sources
+557acdab-262a-11ed-a544-507b9dea1806,Task: stockmanagement.stockSources.mutate,Able to create and update stock sources
+5a421e1a-28ad-11ed-bdcb-507b9dea1806,App: stockmanagement.stockOperationType,Able to view stock operation types
+55670834-28ad-11ed-bdcb-507b9dea1806,Task: stockmanagement.party.read,Able to read party information
+27334ff0-698d-11ed-a1c5-806d973f13a9,App: stockmanagement.reports,Able to view stock reports
+8f0cecbb-6b11-11ed-93a2-806d973f13a9,Task: stockmanagement.reports.mutate,Able to create stock reports

distro/configuration/roles/roles_stockmanagement.csv

@@ -0,0 +1,8 @@
+Uuid,Role name,Description,Inherited roles,Privileges,_order:1000
+7d8d214d-2188-11ed-9dff-507b9dea1806,Stock Management Base Role,This Role is the default Role for stock management with basic functionality with less privileges,,App: stockmanagement.dashboard; App: stockmanagement.stockItems; App: stockmanagement.stockoperations; Get Concepts; Get Locations; Get Users; Get Roles; App: stockmanagement.stockSources;App: stockmanagement.stockOperationType; Task: stockmanagement.party.read,
+cca4be4b-2188-11ed-9dff-507b9dea1806,Inventory Manager,This enables managing stock management operations accross the stock management application,Stock Management Base Role,Task: stockmanagement.stockItems.mutate; Task: stockmanagement.stockoperations.mutate; Task: stockmanagement.stockoperations.approve; Task: stockmanagement.stockSources.mutate; Task: stockmanagement.stockoperations.receiveitems,
+2083fd40-3391-11ed-a667-507b9dea1806,Inventory Administrator,This Role enables full access to stock management application,Inventory Manager,App: stockmanagement.userRoleScopes; Task: stockmanagement.userRoleScopes.mutate,
+d210eb66-2188-11ed-9dff-507b9dea1806,Inventory Clerk,This Role enables access to daily stock operations,Stock Management Base Role,Task: stockmanagement.stockoperations.mutate; Task: stockmanagement.stockSources.mutate; Task: stockmanagement.stockoperations.receiveitems,
+8ee2f2ac-467f-11ed-8109-00155dcc3fc0,Inventory Provider Access,This Role enables a provider to view inventory items and access quantities available,,App: stockmanagement.stockItems; Get Concepts; Get Locations; Get Users; App: stockmanagement.stockSources; App: stockmanagement.stockOperationType; Task: stockmanagement.party.read; Task: stockmanagement.stockItems.dispense.qty,
+84bdd876-4694-11ed-8109-00155dcc3fc0,Inventory Dispensing,This Role enables a provider to dispence inventory items,Inventory Provider Access,Task: stockmanagement.stockItems.dispense,
+a49be648-6b0a-11ed-93a2-806d973f13a9,Inventory Reporting,This Role enables a provider to access reports,Stock Management Base Role,App: stockmanagement.reports; Task: stockmanagement.reports.mutate; Manage Scheduler; Get Patients,

distro/distro.properties

@@ -29,3 +29,5 @@ omod.patientflags=${patientflags.version}
 omod.o3forms=${o3forms.version}
 omod.authentication=${authentication.version}
 
+omod.stockmanagement=${stockmanagement.version}
+omod.billing=${billing.version}

distro/pom.xml

@@ -49,6 +49,11 @@
     <ordertemplates.version>1.0.2</ordertemplates.version>
     <patientflags.version>3.0.7</patientflags.version>
     <o3forms.version>2.3.0-SNAPSHOT</o3forms.version>
+    <patientflags.version>3.0.5</patientflags.version>
+    <o3forms.version>2.2.0</o3forms.version>
+    <!-- Stock Management and Billing -->
+    <stockmanagement.version>2.0.1-SNAPSHOT</stockmanagement.version>
+    <billing.version>1.0.0-SNAPSHOT</billing.version>
   </properties>
 
   <dependencies>
@@ -199,6 +204,18 @@
       <version>${o3forms.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.openmrs.module</groupId>
+      <artifactId>stockmanagement-omod</artifactId>
+      <version>${stockmanagement.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openmrs.module</groupId>
+      <artifactId>billing-omod</artifactId>
+      <version>${billing.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>

frontend/spa-assemble-config.json

@@ -36,7 +36,9 @@
     "@openmrs/esm-primary-navigation-app": "next",
     "@openmrs/esm-service-queues-app": "next",
     "@openmrs/esm-system-admin-app": "next",
-    "@openmrs/esm-user-onboarding-app": "next"
+    "@openmrs/esm-user-onboarding-app": "next",
+    "@openmrs/esm-stock-management-app": "next",
+    "@openmrs/esm-billing-app": "next"
   },
   "excludedFrontendModules": []
 }