chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' #29542
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
…e Finance Book (cherry picked from commit a4043c0)
(cherry picked from commit 059d1f3) # Conflicts: # erpnext/assets/doctype/asset/asset.py
…nal Entries before modifying the schedule (cherry picked from commit 475d839)
…Finance Books (cherry picked from commit f455de2)
… clearing the schedule (cherry picked from commit 33a0b1d)
… books (cherry picked from commit 6ec5a19)
(cherry picked from commit 4311936)
…ommerce-cart-badge
…ommerce-cart-badge
Some old servers running on mariadb <10.2 can't work with CTEs hence reverting to basic python code Co-authored-by: Ankush Menat <ankush@frappe.io>
…frappe#29333) Negative stock validation is done BEFORE reposting as such it's not required to be performed again and most likely this fails on old intermediate data where user has no clue why it failed. (cherry picked from commit fabe0bc) Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 4f52b86) # Conflicts: # erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
(cherry picked from commit c872aa4) # Conflicts: # erpnext/patches.txt
(cherry picked from commit 9109660)
(cherry picked from commit 90d3200)
(cherry picked from commit b98c61f) # Conflicts: # erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
(cherry picked from commit dec7513)
…fix/pr-28843 refactor: update_serial_no function for old Maintenance Visits (backport frappe#28843)
…#29114 (frappe#29361) fix: from time and to time not updated in drag and drop action (cherry picked from commit 8b5827e) Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
…port_template fix: Cleanup empty rows on bank statement import
- Added filters in the Report for BOM ID, Item Code and Workstation - Converted Raw SQL to frappe.qb and added method to get filtered data - Changed fieldtype of 'Time in mins' from Int to Float - Get BOM wise grouped data to keep order and accurate grouping in report (cherry picked from commit a9ff1fc)
(cherry picked from commit b20df37)
(cherry picked from commit e177c52)
(cherry picked from commit 43bd88e)
(cherry picked from commit e45c383)
…) (frappe#29521) * fix: cost of poor quality report time filters not working * chore:update cost of poor quality report to use query builder * fix: linter warnings * chore: updated report query * chore: added test filters * fix : cleared linter warnings * chore: formatting * refactor: query generation - optionally apply date filters - join instead of expensive sub-query - return as dictionary * test: simplify test Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 0f7c2a1) Co-authored-by: aaronmenezes <ron2805@gmail.com>
…fix/pr-29499 fix(India): Tax calculation for overseas suppliers (backport frappe#29499)
(cherry picked from commit a73ad67) # Conflicts: # erpnext/selling/doctype/sales_order/sales_order.js
(cherry picked from commit 0b9a850)
…fix/pr-29454 fix(sales order): incorrect no. of items fetched while creating dn (backport frappe#29454)
(cherry picked from commit 08810db)
(cherry picked from commit a1e7771)
(cherry picked from commit 7ff3ca2)
fix(patch): delete fully broken bins if bin doesn't have item_code or warehouse then it's not recoverable. (cherry picked from commit c2ecc7a)
(cherry picked from commit 0a15334)
…rappe#29538) (cherry picked from commit a254201) Co-authored-by: Ankush Menat <ankush@frappe.io>
…fix/pr-29519 fix: bin uniqueness (backport frappe#29519)
…ppe#29540) * refactor!: dynamically compute bom_level (cherry picked from commit 157b4b3) # Conflicts: # erpnext/manufacturing/doctype/bom/bom.py # erpnext/patches.txt * fix(ux): sort multi-production item plans correctly (cherry picked from commit d38fd86) * fix: conflicts * fix: removed set_bom_level * fix: conflict Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.