Merge branch 'main' into O3-3886

# Conflicts:
#	distro/distro.properties
#	distro/pom.xml
#	frontend/spa-assemble-config.json

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ### Dev Stage
-FROM openmrs/openmrs-core:dev-amazoncorretto-11 as dev
+FROM openmrs/openmrs-core:dev-amazoncorretto-11 AS dev
 WORKDIR /openmrs_distro
 
 ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U -P distro"

distro/configuration/billableservices/billableServices.csv

@@ -0,0 +1,5 @@
+Uuid, Void/Retire, Service Name, Short Name, Concept, Service Type, Service Status
+44ebd6cd-04ad-4eba-8ce1-0de4564bfd17,, Antenatal care, ANTC, 1592AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Antenatal Services, Enabled
+a0f7d8a1-4fa2-418c-aa8a-9b358f43d605,, Orthopedic Service, OTHS, 164949AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Orthopedic Services, Enabled
+16435ab4-27c3-4d91-b21e-52819bd654d8,, Nutrition counseling, NUC, 1380AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Nutrition Services, Enabled
+360fab13-d92b-4a9f-ad4e-0ac223e7f54c,, OPD consultation, OPDC, 160542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, Orthopedic Services, Enabled

distro/configuration/cashpoints/cashPoints.csv

@@ -0,0 +1,4 @@
+uuid,Void/Retire,name,description,location
+54065383-b4d4-42d2-af4d-d250a1fd2590,, OPD Cash Point, Opd cash point for billing, Opd Clinic
+ba685651-ed3b-4e63-9b35-78893060758a,, IPD Cash Point, IPD cash point for billing, Inpatient Ward
+1ce1b7d4-c865-4178-82b0-5932e51503d6,, Community Outreach, MCH cash point for billing, Community Outreach

distro/configuration/paymentmodes/paymentModes.csv

@@ -0,0 +1,4 @@
+uuid, Void/Retire, name, attributes
+526bf278-ba81-4436-b867-c2f6641d060a,, Cash,
+2b1b9aae-5d35-43dd-9214-3fd370fd7737,, Bank transfer,
+e168c141-f5fd-4eec-bd3e-633bed1c9606,, Paypal, Maximum::Numeric::::True;Minimum

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

@@ -32,3 +32,5 @@ omod.emrapi=${emrapi.version}
 omod.event.groupId=org.openmrs
 omod.event=${event.version}
 omod.bedmanagement=${bedmanagement.version}
+omod.stockmanagement=${stockmanagement.version}
+omod.billing=${billing.version}

distro/pom.xml

@@ -25,33 +25,36 @@
          we do so here so that we can utilise Maven to track updates, etc. -->
     <fhir2.version>2.3.0-SNAPSHOT</fhir2.version>
     <authentication.version>1.0.0</authentication.version>
-    <openmrs.version>2.6.7</openmrs.version>
+    <openmrs.version>2.6.9</openmrs.version>
     <initializer.version>2.8.0-SNAPSHOT</initializer.version>
     <webservices.rest.version>2.45.0-SNAPSHOT</webservices.rest.version>
-    <addresshierarchy.version>2.17.0</addresshierarchy.version>
-    <idgen.version>4.10.0</idgen.version>
-    <legacyui.version>1.16.0</legacyui.version>
+    <addresshierarchy.version>2.19.0</addresshierarchy.version>
+    <idgen.version>4.12.0</idgen.version>
+    <legacyui.version>1.18.0</legacyui.version>
     <metadatamapping.version>1.6.0</metadatamapping.version>
     <metadatasharing.version>1.9.0</metadatasharing.version>
-    <openconceptlab.version>2.3.0</openconceptlab.version>
-    <attachments.version>3.2.0</attachments.version>
+    <openconceptlab.version>2.4.0</openconceptlab.version>
+    <attachments.version>3.4.0</attachments.version>
     <referencedemodata.version>2.4.0</referencedemodata.version>
     <queue.version>2.4.0</queue.version>
     <appointments.version>2.0.0-20240305.062514-14</appointments.version>
     <teleconsultation.version>2.0.0-20230831.113926-1</teleconsultation.version>
-    <cohort.version>3.7.1</cohort.version>
+    <cohort.version>3.7.2</cohort.version>
     <reporting.version>1.26.0</reporting.version>
     <reportingrest.version>1.14.0</reportingrest.version>
     <!-- the next three are required for reporting -->
     <calculation.version>1.3.0</calculation.version>
     <htmlwidgets.version>1.11.0</htmlwidgets.version>
     <serialization-xstream.version>0.2.16</serialization-xstream.version>
     <ordertemplates.version>1.0.2</ordertemplates.version>
-    <patientflags.version>3.0.7</patientflags.version>
+    <patientflags.version>3.0.8</patientflags.version>
     <o3forms.version>2.3.0</o3forms.version>
     <emrapi.version>2.1.0-SNAPSHOT</emrapi.version>
     <event.version>2.10.0</event.version>
     <bedmanagement.version>6.0.0</bedmanagement.version>
+    <!-- Stock Management and Billing -->
+    <stockmanagement.version>2.0.2-SNAPSHOT</stockmanagement.version>
+    <billing.version>1.2.0-SNAPSHOT</billing.version>
   </properties>
 
   <dependencies>
@@ -220,6 +223,18 @@
       <version>${bedmanagement.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

@@ -38,6 +38,9 @@
     "@openmrs/esm-system-admin-app": "next",
     "@openmrs/esm-user-onboarding-app": "next",
     "@openmrs/esm-ward-app": "next"
+    "@openmrs/esm-user-onboarding-app": "next",
+    "@openmrs/esm-stock-management-app": "next",
+    "@openmrs/esm-billing-app": "next"
   },
   "excludedFrontendModules": []
 }

pom.xml

@@ -109,12 +109,12 @@
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>
           <artifactId>openmrs-sdk-maven-plugin</artifactId>
-          <version>4.5.0</version>
+          <version>5.15.0</version>
         </plugin>
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>
           <artifactId>openmrs-packager-maven-plugin</artifactId>
-          <version>1.7.0</version>
+          <version>1.9.0-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>