Merge from upstream v12 #39
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
…#27538) (frappe#27593) * fix: Validate if item exists on uploading items in stock reco - Uploading non existent item in stock reco and then changing warehouse or batch gave an error - Check for non existent item * chore: translation Co-authored-by: Marica <maricadsouza221197@gmail.com>
…component-account-filter Revert "fix: salary component account filter"
* fix: set item.qty as mandatory in picklist (frappe#27680) (cherry picked from commit b91333a) # Conflicts: # erpnext/stock/doctype/pick_list_item/pick_list_item.json * fix: resolve conflicts Co-authored-by: Alan <2.alan.tom@gmail.com>
* fix: empty row on new maintenance visit. * fix: check if rows exist
frappe#27781) * fix: set item uom as stock_uom if it isn't set (frappe#27623) * fix: set item uom as stock_uom if it isn't set (cherry picked from commit 5c37220) # Conflicts: # erpnext/stock/doctype/stock_entry/stock_entry.js * fix: resolve conflicts [skip ci] Co-authored-by: Alan <2.alan.tom@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) # Conflicts: # erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
…fix/pr-27728 fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation (backport frappe#27728)
…6701) (frappe#28062) * chore: warning for shopify integration deprecation (frappe#26701) * chore: warning for shopify integration deprecation * fix: warn deprecation during patch for sysadmins (cherry picked from commit e43bdf7) # Conflicts: # erpnext/patches.txt * fix: resolve conflicts Co-authored-by: Ankush <ankush@iwebnotes.com> Co-authored-by: Ankush Menat <ankush@frappe.io>
feat: Make Gross Profit Report more readable
…-into-pre-release-for-v12-26 chore: Merge branch 'version-12-hotfix' into 'v12-pre-release'
chore: change log for v12.26.0
fix: change log
Bug Fixes
Chore
Contributorsfrappe-pr-bot, mergify[bot], pateljannat, nextchamp-saqib, noahjacob, gavindsouza, ankush, gohyc, GangaManoj Commit-Lint commandsYou can trigger Commit-Lint actions by commenting on this PR:
|
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.