-
Notifications
You must be signed in to change notification settings - Fork 91
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
#9960 pharmacy retail sale not available even after starting a new shift #9961
Merged
ChinthakaPrasad
merged 110 commits into
development
from
#9960_Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift
Jan 6, 2025
Merged
#9960 pharmacy retail sale not available even after starting a new shift #9961
ChinthakaPrasad
merged 110 commits into
development
from
#9960_Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift
Jan 6, 2025
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
… Issue#8677 # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Buddhika <buddhika.ari@gmail.com>
…s://github.com/hmislk/hmis.git into Issue#9834/opd-and-inward-due-report
…islk/hmis.git into Issue#9834/opd-and-inward-due-report
… Issue#9834/opd-and-inward-due-report
…github.com/hmislk/hmis.git into Issue#9834/opd-and-inward-due-report
….com/hmislk/hmis.git into Issue#9834/opd-and-inward-due-report
…tps://github.com/hmislk/hmis.git into Issue#8677 # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Buddhika <buddhika.ari@gmail.com>
…is.git into Issue#9834/opd-and-inward-due-report
… Issue#9834/opd-and-inward-due-report
…islk/hmis.git into Issue#9834/opd-and-inward-due-report
…sue#9834/opd-and-inward-due-report # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com>
…s://github.com/hmislk/hmis.git into Issue#9834/opd-and-inward-due-report # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com>
…islk/hmis.git into Issue#9834/opd-and-inward-due-report
…ssue#9834/opd-and-inward-due-report
…om/hmislk/hmis.git into Issue#9834/opd-and-inward-due-report # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
…islk/hmis.git into Issue#9834/opd-and-inward-due-report # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
https://github.com/hmislk/hmis.git into Issue#9834/opd-and-inward-due-report # Conflicts: # src/main/resources/META-INF/persistence.xml
…hmislk/hmis.git into Issue#9834/opd-and-inward-due-report # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
…k/hmis.git into Issue#9834/opd-and-inward-due-report
Updates from development
… Issue#9834/opd-and-inward-due-report
…slk/hmis.git into Issue#9834/opd-and-inward-due-report
…Issue#9834/opd-and-inward-due-report
…into view_purchased_items_for_pharmacy_#9933 # Conflicts: # .github/workflows/custom_deployment.yml Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
…into view_purchased_items_for_pharmacy_#9933
…s.git into view_purchased_items_for_pharmacy_#9933
…k/hmis.git into view_purchased_items_for_pharmacy_#9933
….com/hmislk/hmis.git into view_purchased_items_for_pharmacy_#9933
…_new_Shift Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
SandithP2001
approved these changes
Jan 2, 2025
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.
Reviewed
…ble_even_after_starting_a_new_Shift
ChinthakaPrasad
deleted the
#9960_Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift
branch
January 6, 2025 07:18
ChinthakaPrasad
added a commit
that referenced
this pull request
Jan 6, 2025
* Signed-off-by: Buddhika <buddhika.ari@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * fix:disbursement recieve issues fixed. * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * fix: add validation for cant issue more than requested medicine quantity. Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> * Signed-off-by: SandithP2001 <sandithpivithuru@gmail.com> closes #9931 * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Issue #9942 Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> closed * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * added opd and cc bills * added batch cancel and refund * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Update PharmacyCalculation.java testing commit * changed column width * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * fixed null pointer exception bug * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * fixed filter bug * Create rh_prod_ci_cd.yml * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * closes #9966 Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Add to Bill view for Sale1,2,3,4 Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Closes #9975 Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Pharmacy retail sale bill error (#9944) * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Issue #9942 Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> Co-authored-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * 9836 pharmacy disbursement and suplier isses (#9946) * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Issue#9949 disbursement issue receive bill improvements (#9950) * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> --------- Co-authored-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Issue#9822 discount report (#9954) * added batch cancel and refund * changed column width --------- Co-authored-by: imexh <chandikaranawella@gmail.com> * OPD Weekly Report #9886 (#9955) * added opd and cc bills * fixed null pointer exception bug * fixed filter bug --------- Co-authored-by: imexh <chandikaranawella@gmail.com> * #9960 pharmacy retail sale not available even after starting a new shift (#9961) * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Issue #9942 Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * added opd and cc bills * added batch cancel and refund * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Update PharmacyCalculation.java testing commit * changed column width * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * fixed null pointer exception bug * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * fixed filter bug * Create rh_prod_ci_cd.yml * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> --------- Signed-off-by: Buddhika <buddhika.ari@gmail.com> Signed-off-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> Co-authored-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com> Co-authored-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> Co-authored-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> * Issue#9834/opd and inward due report (#9971) * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Create build.yml * Create deploy.yml * Update build.yml * Update deploy.yml * Delete .github/workflows/deploy.yml * Update and rename build.yml to manual_deployment.yml * Delete .github/workflows/manual_deployment.yml * Create dev_dispatch.yml * Delete .github/workflows/dev_dispatch.yml * Create custom_deployment.yml * Update custom_deployment.yml * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Issue #9942 Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * Signed-off-by: Buddhika <buddhika.ari@gmail.com> * added opd and cc bills * added batch cancel and refund * Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> * Update PharmacyCalculation.java testing commit * changed column width * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * fixed null pointer exception bug * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * fixed filter bug * Create rh_prod_ci_cd.yml * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * closes #9966 Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Add to Bill view for Sale1,2,3,4 Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: PasinduW99 <pwathsara@gmail.com> * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> * Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> --------- Signed-off-by: Buddhika <buddhika.ari@gmail.com> Signed-off-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: PasinduW99 <pwathsara@gmail.com> Co-authored-by: Buddhika <buddhika.ari@gmail.com> Co-authored-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> Co-authored-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: PasinduW99 <pwathsara@gmail.com> Co-authored-by: Pasindu Wathsara <113449846+PasinduW99@users.noreply.github.com> --------- Signed-off-by: Buddhika <buddhika.ari@gmail.com> Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> Signed-off-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com> Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com> Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com> Signed-off-by: PasinduW99 <pwathsara@gmail.com> Co-authored-by: Chinthaka Prasad <chinthakaprasad30@gmail.com> Co-authored-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com> Co-authored-by: SandithP2001 <sandithpivithuru@gmail.com> Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com> Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com> Co-authored-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com> Co-authored-by: imexh <chandikaranawella@gmail.com> Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com> Co-authored-by: Irani Madushika <153506668+Irani96@users.noreply.github.com> Co-authored-by: Sandith Pivithuru <114053279+SandithP2001@users.noreply.github.com> Co-authored-by: PasinduW99 <pwathsara@gmail.com> Co-authored-by: Pubudu Piyankara <139697238+Pubudu-Piyankara@users.noreply.github.com> Co-authored-by: Imesh Ranawella <imeshranawella00@gmail.com> Co-authored-by: Isuru Ranaweera <152675215+IsuruUdaraRanaweera@users.noreply.github.com> Co-authored-by: Pasindu Wathsara <113449846+PasinduW99@users.noreply.github.com>
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.
No description provided.