Update from development branch #9999
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
… 9836-pharmacy_disbursement_and_suplier_isses
…ub.com/hmislk/hmis.git into 9836-pharmacy_disbursement_and_suplier_isses # Conflicts: # src/main/java/com/divudi/bean/common/ReportsController.java
… 9836-pharmacy_disbursement_and_suplier_isses # Conflicts: # src/main/java/com/divudi/bean/common/ReportsController.java
…s://github.com/hmislk/hmis.git into 9836-pharmacy_disbursement_and_suplier_isses
… 9836-pharmacy_disbursement_and_suplier_isses # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>
…mislk/hmis.git into 9836-pharmacy_disbursement_and_suplier_isses # Conflicts: # src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>
…ity. Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>
…//github.com/hmislk/hmis.git into issue#9412_Expiry_Item_Report # Conflicts: # src/main/resources/META-INF/persistence.xml # src/main/webapp/pharmacy/pharmacy_purhcase_order_approving.xhtml
…/hmislk/hmis.git into issue#9412_Expiry_Item_Report
…tps://github.com/hmislk/hmis.git into issue#9412_Expiry_Item_Report # Conflicts: # src/main/resources/META-INF/persistence.xml
…s://github.com/hmislk/hmis.git into issue#9412_Expiry_Item_Report # Conflicts: # src/main/resources/META-INF/persistence.xml
…islk/hmis.git into issue#9412_Expiry_Item_Report
… Issue#9940_Grn_report_improment # Conflicts: # src/main/resources/META-INF/persistence.xml
Updates from development
Issue#9412 expiry item report Closes #9412
Issue#9931 expiry item improvement Closes #9931
Issue#9940 grn report improment Closes #9940
* 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>
* 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: 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>
* added batch cancel and refund * changed column width --------- Co-authored-by: imexh <chandikaranawella@gmail.com>
…ift (#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>
* 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>
Update from development branch
Add ruhunu-dev merge commits
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.