Merge branch develop into staging #1376
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
…1307) * feat: procument tracker report batch_no and package tag info added * chore: minor changes added
…ctype (#1324) Co-authored-by: meshramsaroj <[email protected]>
…in source package tag (#1318)
Merge branch bs-may-sprint-2 into pre-release
Merge branch hotfix into pre-release
Merge branch hotfix into production
Merge branch hotfix into production
Merge branch hotfix into production
Merge branch hotfix into production
* chore: Employee Doc : Employee code * removed the curr.frm code from the leave application * Update erpnext/hr/doctype/leave_application/leave_application.js Co-authored-by: Himanshu <[email protected]>
Merge branch bs-may-sprint-2 into pre-release
Merge branch hotfix into pre-release
* fix: fixed the license field data in sales invoice format * fix: fixed the spellling error
Merge branch bs-may-sprint-2 into pre-release
… dialog where condition prompts NO (#1349)
* feat: Improve authorizenet reliability * chore: Removes prints and console.log statements * feat: Hard error message and tidy up * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * fix: Remove guest access to card apis * fix: js formatting * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py
Merge branch bs-may-sprint-2 into pre-release
* feat: added product recall feature in erpnext * fix: changed auto name for product recall notice * fix: added docstring to product_recall.py * fix: fixed formatting in product_recall.py * fix: added comments in product_recall.py * fix: added comments in product_recall.py * fix: changed iteration to create product recall notice doc in product recall * fix: changed iteration to create product recall notice doc in product recall * Update erpnext/stock/doctype/product_recall/product_recall.py * Update erpnext/stock/doctype/product_recall_notice/product_recall_notice.py * Update erpnext/stock/doctype/product_recall_notice/product_recall_notice.py
Merge branch bs-may-sprint-2 into pre-release
* fix: order for contact display issue fixed * Update erpnext/shopping_cart/cart.py Co-authored-by: sahil28297 <[email protected]>
Merge branch hotfix into pre-release
Co-authored-by: Sahil Khan <[email protected]>
Merge branch bs-may-sprint-2 into pre-release
Merge branch bs-may-sprint-2 into pre-release
* feat: Improve authorizenet reliability * chore: Removes prints and console.log statements * feat: Hard error message and tidy up * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * Update erpnext/templates/includes/integrations/authorizenet_checkout.js * fix: Remove guest access to card apis * fix: js formatting * feat: Improves card details sent to authnet and payment entry details * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/erpnext_integrations/doctype/authorizenet_settings/authorizenet_settings.py * Update erpnext/templates/includes/integrations/authorizenet_checkout.js
Merge branch bs-may-sprint-2 into pre-release
) * fix: applied filter for batch_no, batch_qty > 0 in product recall * Update erpnext/stock/doctype/batch/batch.py Co-authored-by: sahil28297 <[email protected]>
Merge branch bs-may-sprint-2 into pre-release
* fix: Added missing date and enabled validations * feat: change enabled validation order * Update erpnext/patches/v13_0/set_coupon_code_enabled.py Co-authored-by: sahil28297 <[email protected]> Co-authored-by: sahil28297 <[email protected]>
Merge branch hotfix into pre-release
Merge branch bs-may-sprint-2 into pre-release
Merge branch hotfix into pre-release
Merge branch bs-may-sprint-2 into pre-release
* fix: remove callback * fix: add insight engine module in patches
Merge branch pre-release into develop
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.