Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10125 inpatient pharmacy issue summery do not exclude cancellations and returns #10126

Conversation

buddhika75
Copy link
Member

No description provided.

buddhika75 and others added 30 commits January 6, 2025 09:30
…10027-export-amp-list

# Conflicts:
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
… 10003-collection-cente-bill-wise-detail-report-bugs
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
… #10036_Grn_report

# Conflicts:
#	src/main/java/com/divudi/bean/pharmacy/GoodsReturnController.java
Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Signed-off-by: DamithDeshan <hkddrajapaksha@gmail.com>
…0064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…ions-are-not-listed-in-inpatient-medicine-issue-summary
…064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…into 10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…//github.com/hmislk/hmis.git into 10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
…10064-refunds-and-cancellations-are-not-listed-in-inpatient-medicine-issue-summary
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
buddhika75 and others added 19 commits January 16, 2025 03:10
…no-in-application-options-page' of https://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy
…s://github.com/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy

# Conflicts:
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
…om/hmislk/hmis.git into 10077-improvements-for-bht-direct-issue-from-pharmacy
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
…into 10114-different-bill-number-generation-strategies-for-opd-billing

# Conflicts:
#	src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml

Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
…evious-shift' into 10114-different-bill-number-generation-strategies-for-opd-billing
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
… total

Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
…summery-do-not-exclude-cancellations-and-returns

10125 inpatient pharmacy issue summery do not exclude cancellations and returns
…125-inpatient-pharmacy-issue-summery-do-not-exclude-cancellations-and-returns
…pd-billing' of https://github.com/hmislk/hmis.git into 10125-inpatient-pharmacy-issue-summery-do-not-exclude-cancellations-and-returns

# Conflicts:
#	src/main/java/com/divudi/bean/opd/OpdBillController.java
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
…s://github.com/hmislk/hmis.git into 10125-inpatient-pharmacy-issue-summery-do-not-exclude-cancellations-and-returns

# Conflicts:
#	src/main/resources/META-INF/persistence.xml

Signed-off-by: Dr M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
…0125-inpatient-pharmacy-issue-summery-do-not-exclude-cancellations-and-returns
@GSMgeeth GSMgeeth merged commit b774b9a into development Jan 20, 2025
@GSMgeeth GSMgeeth deleted the 10125-inpatient-pharmacy-issue-summery-do-not-exclude-cancellations-and-returns branch January 20, 2025 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inpatient Pharmacy Issue Summery do not exclude Cancellations and Returns
8 participants