Coop stg #10316
Merged
Coop stg #10316
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
added 30 commits
October 25, 2024 11:44
…R8mw24IlVa9Vv8u3uDfNOl3sLdvm>
…R8mw24IlVa9Vv8u3uDfNOl3sLdvm>
…issue#7224 # Conflicts: # pom.xml # src/main/resources/META-INF/persistence.xml Signed-off-by: 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 <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>
…R8mw24IlVa9Vv8u3uDfNOl3sLdvm>
…R8mw24IlVa9Vv8u3uDfNOl3sLdvm>
… issue#7224 # Conflicts: # pom.xml # src/main/resources/META-INF/persistence.xml
…issue#7224 # Conflicts: # src/main/resources/META-INF/persistence.xml
…issue#7224 # Conflicts: # pom.xml # src/main/resources/META-INF/persistence.xml # src/main/webapp/WEB-INF/glassfish-web.xml
…issue#7224 # Conflicts: # src/main/resources/META-INF/persistence.xml
… issue#7224 # Conflicts: # pom.xml # src/main/webapp/WEB-INF/glassfish-web.xml
… issue#7224 # Conflicts: # src/main/resources/META-INF/persistence.xml
…ssue#7224 # Conflicts: # src/main/resources/META-INF/persistence.xml
…issue#7224 # Conflicts: # pom.xml # src/main/resources/META-INF/persistence.xml
…R8mw24IlVa9Vv8u3uDfNOl3sLdvm>
… issue#7224 # Conflicts: # pom.xml # src/main/webapp/WEB-INF/glassfish-web.xml
…issue#7224 # Conflicts: # src/main/webapp/WEB-INF/glassfish-web.xml
… issue#7224 # Conflicts: # src/main/resources/META-INF/persistence.xml
…issue#7224 # Conflicts: # src/main/resources/META-INF/persistence.xml
… issue#7224 # Conflicts: # pom.xml # src/main/resources/META-INF/persistence.xml
…issue#7224 # Conflicts: # src/main/resources/META-INF/persistence.xml
…' into 10233-direct-purchase-last-purchase-rate-not-get-automatically
…3-direct-purchase-last-purchase-rate-not-get-automatically
… 10233-direct-purchase-last-purchase-rate-not-get-automatically
…nto 10233-direct-purchase-last-purchase-rate-not-get-automatically # Conflicts: # src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java # src/main/webapp/pharmacy/pharmacy_bill_retail_sale.xhtml # src/main/webapp/resources/store/adjustmentBill_purchase_price.xhtml Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
…-number-as-an-option-in-channelling' into 10233-direct-purchase-last-purchase-rate-not-get-automatically # Conflicts: # src/main/java/com/divudi/bean/pharmacy/PharmacySaleController.java # src/main/resources/META-INF/persistence.xml 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]>
…ue-bills 10263 improve the prints of issue bills
…ue-bills 10263 improve the prints of issue bills
* Expiry item report bugfixes (#10270) * 10253 grn cash cogs report wireframe (#10271) * 10254 grn credit cogs report wireframe (#10272) * Dates formatted in all 3 report types and excel (#10273) * Issue#10275 fix interim bill don't get child encounter's items and fees (#10276) * Collection Center Bill Wise Detail bugfixes (#10277) Co-authored-by: imexh <[email protected]> * Signed-off-by: Chinthaka Prasad Wijerathna <[email protected]> * fix: pharmacy tranfer bill improvement done. 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: Chinthaka Prasad Wijerathna <[email protected]> Co-authored-by: Imesh Ranawella <[email protected]> Co-authored-by: Sandith Pivithuru <[email protected]> Co-authored-by: Isuru Ranaweera <[email protected]> Co-authored-by: Dr. M H B Ariyaratne <[email protected]> Co-authored-by: Lawan Chaamindu Jayalath Samarasekara <[email protected]> Co-authored-by: imexh <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
Signed-off-by: Dr M H Buddhika Ariyaratne <[email protected]>
10285 stock history update
…-receive-view' into 10285-stock-history-update
… 10285-stock-history-update
…285-stock-history-update
10285 stock history update
Development to Coop Prod
Updates Coop Stg Actions File Dependency Versions
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.