Getting Development to Matara Pharmacy Production #10348
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
…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 <[email protected]>
…evious-shift' into 10114-different-bill-number-generation-strategies-for-opd-billing
…s://github.com/hmislk/hmis.git into 10114-different-bill-number-generation-strategies-for-opd-billing
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H B Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…summery-do-not-exclude-cancellations-and-returns 10125 inpatient pharmacy issue summery do not exclude cancellations and returns
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]>
… 10114-different-bill-number-generation-strategies-for-opd-billing # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Updates from development branch
to sent to production
Signed-off-by: Lawan Samarasekara <[email protected]>
Fixed Issue With OPD Card Can't Add Drugs
Signed-off-by: DamithDeshan <[email protected]>
Signed-off-by: DamithDeshan <[email protected]>
Signed-off-by: DamithDeshan <[email protected]>
Signed-off-by: DamithDeshan <[email protected]>
…://github.com/hmislk/hmis.git into 10223-improving-store-adjustment-bill-search # Conflicts: # src/main/java/com/divudi/bean/store/StoreAdjustmentController.java Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
* closes #10241 Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * Signed-off-by: DamithDeshan <[email protected]> * closes #9370 Signed-off-by: DamithDeshan <[email protected]> --------- Signed-off-by: DamithDeshan <[email protected]>
…ment (#10299) * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 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]>
* Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10291 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]> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 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]> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9986 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]>
Development to Coop Prod
* Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9939 Also adds Supplier Payment Preperation Bill Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Update persistence.xml --------- Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[email protected]>
Co-authored-by: imexh <[email protected]>
Updates Coop Stg Actions File Dependency Versions
* Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10291 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]> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 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]> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9986 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]> * Closes #9939 Also adds Supplier Payment Preperation Bill 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]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * fix: pharmacy retail search expire and expire soon item display corrected. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> --------- Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: Dr M H Buddhika Ariyaratne <[email protected]>
* fact: add expense section to direct purchase and update bill with net total Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fact:improve purchase bill adding expenses and ui improvements. Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10116 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10187 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10176 * add department wise filter for inward pharmacy issue summery Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Closes #10191 Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Update mp_prod_ci_cd.yml * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Payment Approval Basics Completed Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10291 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]> * Closes #10259 Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10259 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]> * GRN No, Invoice No added Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #9986 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]> * Closes #9939 Also adds Supplier Payment Preperation Bill 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]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H B Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10334 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]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #7830 now can search supplier credit bills Make sure you select the option "Approveal necessary is required for Supplier Payments" as false Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> * Closes #10337 But need to fix pharmacy summery reports, cashier summary as seperate issues * 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]> * Closes #3832 For Institutions where GRN payment approval is NOT necessary (Make the configuration) Payments Menu > SUpplier Payment > Settle Bills by SUpplier * Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> --------- Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> Signed-off-by: Dr M H B Ariyaratne <[email protected]> Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]> Co-authored-by: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: Geeth Sandaru Madhushan <[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.
Getting Development to Matara Pharmacy Production