10044 need sqeuencial bill numbers for pharmacy direct purchase #10090
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
…t_#9984' into all_cashier_summary_for_logged_department_#9990
…ll_cashier_summary_for_logged_department_#9990
…into all_cashier_summary_for_logged_department_#9990
…thub.com/hmislk/hmis.git into new # Conflicts: # src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
… new # Conflicts: # src/main/webapp/reports/inventoryReports/expiry_item.xhtml
https://github.com/hmislk/hmis.git into new # Conflicts: # src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
…ttps://github.com/hmislk/hmis.git into new # Conflicts: # src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
Signed-off-by: Isuru Ranaweera <[email protected]>
Signed-off-by: Isuru Ranaweera <[email protected]>
…thub.com/hmislk/hmis.git into new # Conflicts: # src/main/webapp/reports/inventoryReports/expiry_item.xhtml
…github.com/hmislk/hmis.git into new # Conflicts: # src/main/resources/META-INF/persistence.xml # src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml # src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml
Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]>
…@users.noreply.github.com>
… 10003-collection-cente-bill-wise-detail-report-bugs
slow fast non movement report done
Updates from development branch
…change #10023 improvement for room change
* fix:data uploader for supplier empty cell validation done. * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad… * Merge branch 'development' of https://github.com/hmislk/hmis.git into…
Updates from development branch
* Merge branch '10029-expiry-item-report' of https://github.com/hmislk/… * Merge branch '10025_Grn_cancellation_excel_file_implementation' of ht… * Merge branch '10027-export-amp-list' of https://github.com/hmislk/hmi… * Merge branch '9994-search-filter-issue-in-inpatient-direct-issue-by-b… * Merge branch 'Issue#10013-Bug_Fix_on_OPD_Card_Can't_Add_Drug' of http… * Signed-off-by: Sandith Pivithuru <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Isuru Ranaweera <[email protected]> * Merge branch '10003-collection-cente-bill-wise-detail-report-bugs' of… * Signed-off-by: Pubudu-Piyankara <[email protected]> * Merge branch '#10050_Grn_return_improvement' of https://github.com/hm… * Fixed #10046 * Signed-off-by: Lawan Samarasekara <[email protected]> * Merge branch 'Issue#10046-Pharmacy_Retail_Sale_Bill' of https://githu… * Merge pull request #10047 from hmislk/development * Merge branch 'coop-dev' of https://github.com/hmislk/hmis.git into new * Merge pull request #10048 from hmislk/Issue#10046-Pharmacy_Retail_Sal… * Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into new * Signed-off-by: Sandith Pivithuru <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * fix:data uploader for supplier empty cell validation done. * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Merge branch '9994-search-filter-issue-in-inpatient-direct-issue-by-b… * Merge pull request #10054 from hmislk/development * Merge branch 'coop-dev' of https://github.com/hmislk/hmis.git into 10… * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Merge pull request #10055 * Merge branch 'ruhunu-dev' of https://github.com/hmislk/hmis.git into … * Refactor row validation method in DataUploadController.
* Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Isuru Ranaweera <[email protected]> * Merge branch '10003-collection-cente-bill-wise-detail-report-bugs' of… * Signed-off-by: Pubudu-Piyankara <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Pubudu-Piyankara <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Closed #10036
…0044-need-sqeuencial-bill-numbers-for-pharmacy-direct-purchase
Signed-off-by: Buddhika Ariyaratne <[email protected]>
…ing-on-non-moving Closes #10057
… 10044-need-sqeuencial-bill-numbers-for-pharmacy-direct-purchase
…044-need-sqeuencial-bill-numbers-for-pharmacy-direct-purchase
…10044-need-sqeuencial-bill-numbers-for-pharmacy-direct-purchase
* changed css file printOnly * Added a new table to print it without filter boxes
* 10034 discount report bug fixes * 10034 discount report bug fixes
* Signed-off-by: Sandith Pivithuru <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Signed-off-by: Sandith Pivithuru <[email protected]> * Use environment variables for JTA data source configuration.
* Fixed #10046 * Signed-off-by: Lawan Samarasekara <[email protected]> * Merge pull request #10048 from hmislk/Issue#10046-Pharmacy_Retail_Sal… * Update rh_prod_ci_cd.yml * Add CI/CD pipeline for MP-PROD environment * Signed-off-by: DamithDeshan <[email protected]>
* Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Fixed #10046 * Signed-off-by: Lawan Samarasekara <[email protected]> * Merge pull request #10048 from hmislk/Issue#10046-Pharmacy_Retail_Sal… * Update rh_prod_ci_cd.yml * Add CI/CD pipeline for MP-PROD environment * Merge branch 'coop-prod' of https://github.com/hmislk/hmis.git into 1… * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Merge branch 'support_mobitel_sms_middleware_to_send_sms_#9970' into … * Merge branch '10027-export-amp-list' into 10064-refunds-and-cancellat… * Merge pull request #10047 from hmislk/development * Merge pull request #10054 from hmislk/development * Merge branch 'coop-dev' of https://github.com/hmislk/hmis.git into 10… * Signed-off-by: Pubudu-Piyankara <[email protected]> * Closed #10050 * Signed-off-by: Pubudu-Piyankara <[email protected]> * Signed-off-by: Isuru Ranaweera <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Isuru Ranaweera <[email protected]> * Merge branch '10003-collection-cente-bill-wise-detail-report-bugs' of… * Signed-off-by: Pubudu-Piyankara <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Signed-off-by: Pubudu-Piyankara <[email protected]> * Merge branch 'development' of https://github.com/hmislk/hmis.git into… * Closed #10036 * Merge branch '#10036_Grn_report' of https://github.com/hmislk/hmis.gi… * Signed-off-by: DamithDeshan <[email protected]> * Merge branch 'Issue#10013-Bug_Fix_on_OPD_Card_Can't_Add_Drug' of http… * closes #10062 * Signed-off-by: DamithDeshan <[email protected]> * Merge branch '10062_cannot_admit_opd_cards_without_room_no' of https:… * Merge pull request #10055 * Merge branch 'ruhunu-dev' of https://github.com/hmislk/hmis.git into … * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10064 * Signed-off-by: Dr M H B Ariyaratne <[email protected]>
* 9964 staff welfare bug fixes * Merge branch 'refs/heads/development' into 9964-Staff-Welfare-report-… * 9964 staff welfare bug fixes * 10034 staff welfare report bug fixes
Replaced `isValidationFailed` with the clearer `isValidationPassed` to improve readability and align method semantics. This change impacts multiple controllers using the updated validation logic from `JsfUtil`. No functional changes were made beyond renaming and logical inversion.
Signed-off-by: Buddhika Ariyaratne <[email protected]>
… 10044-need-sqeuencial-bill-numbers-for-pharmacy-direct-purchase # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Buddhika Ariyaratne <[email protected]>
Signed-off-by: Buddhika Ariyaratne <[email protected]>
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.
Hot Fix