Merge from upstream v12 #45
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
…rappe#28141) - Dont try to get valuation rate if row has no item code - Dont try to add exploded items if row has no item code (cherry picked from commit 292419b) Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 048210a)
(cherry picked from commit 48886ee)
…fix/pr-28195 fix: (ux) Remove warehouse filter on Batch field for Material Receipt (backport frappe#28195)
(cherry picked from commit 59c31bb)
(cherry picked from commit 4f53837)
(cherry picked from commit 6a3bd88)
(cherry picked from commit bc1e7bc)
(cherry picked from commit dd3cadd)
(cherry picked from commit f2fbcc8)
…fix/pr-28065 fix(minor): check if gst_category exists while validating GSTIN (backport frappe#28065)
* fix: specify fields to be set in Lead (frappe#28288) (cherry picked from commit da22744) # Conflicts: # erpnext/shopping_cart/cart.py * fix: merge conflict Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit c0f06bc) Co-authored-by: Ankush Menat <ankush@frappe.io>
This is not used anywhere. It was added in this commit frappe@df83148 even there it isn't being used. (cherry picked from commit e1ab290) Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit f8a26a9)
(cherry picked from commit cdbc991) # Conflicts: # erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
(cherry picked from commit 7ff30a4) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
(cherry picked from commit c7701ac)
(cherry picked from commit f862339)
…pre-release-for-12-27 chore: Merge branch 'version-12-hotfix' into 'v12-pre-release'
Bug Fixes
Chore
Contributorsmergify[bot], ankush, marination, Anuja-pawar, deepeshgarg007, nextchamp-saqib, rohitwaghchaure Commit-Lint commandsYou can trigger Commit-Lint actions by commenting on this PR:
|
(cherry picked from commit c3e0de2)
…fix/pr-28797 fix: validate if asset account is set against company (backport frappe#28797)
(cherry picked from commit fdffa03) fix: resolve conflict fix
…ssue fix: travis failing
…pre-release-for-12-28 chore: Merge branch 'version-12-hotfix' into 'v12-pre-release'
…12-28 chore: change log for v12.28.0
…e Submitted or Partially Depreciated state
…d or Partially Depreciated state
…assets fix: Display 'Make Depreciation Entry' only for submitted or partially depreciated Assets
…fix-to-pre-release-for-12-29 chore: merge branch 'version-12-hotfix' into 'v12-pre-release'
…12-29 chore: change log for v12.29.0
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.