Conflict resolution when coop pro is merged in to development branch #10680
+214
−0
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]>
…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]>
…matrix-configuration-for-inpatient-direct-issue # Conflicts: # src/main/resources/META-INF/persistence.xml # src/main/webapp/resources/pharmacy/grn.xhtml Signed-off-by: Dr M H B Ariyaratne <[email protected]>
…@users.noreply.github.com>
…@users.noreply.github.com>
…s://github.com/hmislk/hmis.git into 7830-cannot-search-using-grn-no-in-dealer-payment # Conflicts: # src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java # src/main/resources/META-INF/persistence.xml # src/main/webapp/dealerPayment/index.xhtml # src/main/webapp/dealerPayment/prepare_supplier_payment.xhtml # src/main/webapp/resources/bill/supplier_payment_preperation.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Dev to coop prod
…ttps://github.com/hmislk/hmis.git into 7830-cannot-search-using-grn-no-in-dealer-payment
… 10334-patient-report---retired-reports-are-also-called # Conflicts: # src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
… into 10329-cannot-be-add-more-than-one-bht-in-inward
…830-cannot-search-using-grn-no-in-dealer-payment # Conflicts: # src/main/resources/META-INF/persistence.xml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
… 7830-cannot-search-using-grn-no-in-dealer-payment
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]>
…ellation---multiple-payment-method 10337 pharmacy retail sale cancellation multiple payment method
…ent-method' into 3832-dealer-payment-by-bill
3832 dealer payment by bill
# Conflicts: # src/main/java/com/divudi/bean/common/EnumController.java # src/main/java/com/divudi/bean/common/PatientController.java # src/main/java/com/divudi/bean/inward/AdmissionController.java # src/main/java/com/divudi/bean/pharmacy/GrnController.java # src/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.java # src/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.java # src/main/java/com/divudi/ws/lims/LimsMiddlewareController.java # src/main/webapp/dealerPayment/index.xhtml # src/main/webapp/dealerPayment/settle_supplier_payment.xhtml # src/main/webapp/inward/pharmacy_bill_return_bht_issue.xhtml # src/main/webapp/resources/pharmacy/inward_direct_issue_return_bill_five_five_custom_3.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
GSMgeeth
approved these changes
Feb 22, 2025
GSMgeeth
deleted the
ConflictResolutionWhenCoopProIsMergedInToDevelopmentBranch
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.
PR Title:
Conflict Resolution After Merging
coop-prointodevelopmentDescription:
When the
coop-probranch was merged into thedevelopmentbranch before creating a PR forcoop-proto incorporate the latest updates fromdevelopment, several conflicts occurred. These conflicts were manually resolved, and the changes have been pushed in this branch:ConflictResolutionWhenCoopProIsMergedInToDevelopmentBranch.Conflicted Files Resolved:
src/main/webapp/resources/pharmacy/inward_direct_issue_return_bill_five_five_custom_3.xhtmlsrc/main/webapp/inward/pharmacy_search_sale_bill_bht.xhtmlsrc/main/webapp/inward/pharmacy_bill_return_bht_issue.xhtmlsrc/main/webapp/dealerPayment/index.xhtmlsrc/main/webapp/dealerPayment/settle_supplier_payment.xhtmlsrc/main/java/com/divudi/ws/lims/LimsMiddlewareController.javasrc/main/java/com/divudi/bean/pharmacy/SupplierPaymentController.javasrc/main/java/com/divudi/bean/pharmacy/PharmacyBillSearch.javasrc/main/java/com/divudi/bean/pharmacy/GrnController.javasrc/main/java/com/divudi/bean/inward/AdmissionController.javasrc/main/java/com/divudi/bean/common/PatientController.javasrc/main/java/com/divudi/bean/common/EnumController.javaAll conflicts have been resolved while ensuring the latest updates are correctly merged without affecting the original logic.
Next Steps:
development.