O3-2996: Add billing module to openmrs distro pom file and spa config #842
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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> | ||
|
There was a problem hiding this comment. For the above, did you intend to use |
||
| <billing.version>1.1.0</billing.version> | ||
|
There was a problem hiding this comment. Has version There was a problem hiding this comment. Yes, this was released. We had to do this also when we were adding domains to iniz that depends on the released version of the module There was a problem hiding this comment. I failed to find such a release from this repository: https://github.com/openmrs/openmrs-module-billing There was a problem hiding this comment.
Could there be a reason why you set this to For I notice that no tag was created on github https://github.com/openmrs/openmrs-module-billing/tags There was a problem hiding this comment. We didn't set that to false, it must have been a default value and we didn't catch it. We will fix it. There was a problem hiding this comment. The module versions changed and the push configuration updated There was a problem hiding this comment. Could there be a reason why you are not using the latest snapshot 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> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you intentionally change the patient flags and o2forms modules?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed, slipped somehow during conflict resolution.