10643 incorrect return values in pharmacy income report #10644
Merged
Conversation
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
… total Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
…@users.noreply.github.com>
…@users.noreply.github.com>
…@users.noreply.github.com>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
…ancellations-and-returns' of https://github.com/hmislk/hmis.git into 10116-different-bill-number-generation-strategies-for-collecting-centre-billing
…s://github.com/hmislk/hmis.git into 10116-different-bill-number-generation-strategies-for-collecting-centre-billing # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Dr M H B Ariyaratne <[email protected]>
…0116-different-bill-number-generation-strategies-for-collecting-centre-billing
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
…pd-billing' into 9668-assign-data-capture-form-templates-to-process-action-definitions # Conflicts: # src/main/java/com/divudi/bean/opd/OpdBillController.java Signed-off-by: Dr M H B Ariyaratne <[email protected]>
…ollecting-centre-billing' into 9668-assign-data-capture-form-templates-to-process-action-definitions
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
…rate-is-different' into 10176-grn-print-not-working-properly
Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
… Hotfix-add-filter-for-pharmacy-issue-summery
…into 10191-prise-matrix-configuration-for-inpatient-direct-issue
…//github.com/hmislk/hmis.git into 10191-prise-matrix-configuration-for-inpatient-direct-issue
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Updates from development
…y-retail-sale 10239 improve search in pharmacy retail sale
…y-retail-sale 10239 improve search in pharmacy retail sale
…91-prise-matrix-configuration-for-inpatient-direct-issue # Conflicts: # src/main/java/com/divudi/bean/inward/InwardReportControllerBht.java # src/main/webapp/inward/reports/inpatient_pharmacy_item_list.xhtml Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…413-bill-number-generation-stragies-are-not-working-properly # Conflicts: # src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java # src/main/java/com/divudi/ejb/BillNumberGenerator.java # src/main/webapp/dealerPayment/approve_supplier_payment.xhtml # src/main/webapp/dealerPayment/complete_approved_and_settled_supplier_payment.xhtml # src/main/webapp/dealerPayment/list_bills_to_generate_supplier_payments.xhtml # src/main/webapp/resources/sql/bills.sql Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Merge branch 'development' of https://github.com/hmislk/hmis.git into 10559-print-improvement---pharmacy-transfer-issue-report # Conflicts: # src/main/webapp/pharmacy/reports/disbursement_reports/pharmacy_report_transfer_issue_bill.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
…roperly' into 7623-convert-prescription-to-dispensing-note
…vert-prescription-to-dispensing-note # Conflicts: # pom.xml # src/main/webapp/WEB-INF/glassfish-web.xml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…' into 7623-convert-prescription-to-dispensing-note
…t' into 7623-convert-prescription-to-dispensing-note
…23-convert-prescription-to-dispensing-note
…ent-method' of https://github.com/hmislk/hmis.git into 7623-convert-prescription-to-dispensing-note # Conflicts: # src/main/java/com/divudi/service/BillService.java # src/main/resources/META-INF/persistence.xml # src/main/webapp/pharmacy/reports/summary_reports/pharmacy_income_report.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…e-return-bill' of https://github.com/hmislk/hmis.git into 7623-convert-prescription-to-dispensing-note
… 7623-convert-prescription-to-dispensing-note
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
GSMgeeth
approved these changes
Feb 21, 2025
GSMgeeth
deleted the
10643-incorrect-return-values-in-pharmacy-income-report
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Now pharmacy income report is correct