forked from frappe/erpnext
-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge from upstream v13 #65
Merged
vjFaLk
merged 585 commits into
ParsimonyGit:parsimony-production-v13
from
Alchez:merge-v13
Jan 23, 2023
Merged
Merge from upstream v13 #65
vjFaLk
merged 585 commits into
ParsimonyGit:parsimony-production-v13
from
Alchez:merge-v13
Jan 23, 2023
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
Bug Fixes
Features
Chore
Tests
Code Refactoring
Continuous Integration
Contributorssagarvora, s-aga-r, rtdany10, ruthra-kumar, deepeshgarg007, gavindsouza, frappe-bot, mergify[bot] Commit-Lint commandsYou can trigger Commit-Lint actions by commenting on this PR:
|
(cherry picked from commit 57038c3)
…fix/pr-32913 fix: set stock UOM in args to ensure item price is fetched (backport frappe#32913)
(cherry picked from commit e4d16c3) # Conflicts: # erpnext/accounts/report/gross_profit/gross_profit.py
1. Invoice with unset `update_stock`, with and without Delivery Notes (cherry picked from commit 2c8b0b1)
(cherry picked from commit 42a59d5)
(cherry picked from commit 4b99217)
(cherry picked from commit b06345a)
…fix/pr-32938 chore: Remove raw SQL query (backport frappe#32938)
feat: page break in SoA pdf
(cherry picked from commit 7df2921)
…fix/pr-32937 refactor: rewrite `job_card.py` queries in QB (backport frappe#32937)
…er_field fix: ambiguous 'cost_center' while using payment reconciliation
(cherry picked from commit 8c13f70)
…fix/pr-32956 fix: Label for applicable dimension table (backport frappe#32956)
chore(payment_entry): Remove dead validations
fix: wrong hsn summary totals
chore: release v13
# [13.42.0](frappe/erpnext@v13.41.1...v13.42.0) (2022-11-15) ### Bug Fixes * add Document Date in E-Invoice print format ([a16347f](frappe@a16347f)) * ambiguous 'cost_center' on payment reconciliation ([e9e5ded](frappe@e9e5ded)) * check type for reference name ([ad648f3](frappe@ad648f3)) * don't set WIP Warehouse if is checked in WO ([4a17711](frappe@4a17711)) * Label for applicable dimension table ([cbc8b2d](frappe@cbc8b2d)) * Pricing rule item group consider UOM ([1ed0b6e](frappe@1ed0b6e)), closes [frappe#32566](frappe#32566) * query condition change ([88ce59a](frappe@88ce59a)) * repayment schedule regeneration ([a19031c](frappe@a19031c)) * set `WIP Warehouse` in Job Card ([f09e427](frappe@f09e427)) * set stock UOM in args to ensure item price is fetched ([bd2242b](frappe@bd2242b)) * wrong totals in hsn summary report ([79d508f](frappe@79d508f)) ### Features * page break in SoA pdf ([e93ac3c](frappe@e93ac3c))
…pe#32978) * fix: cast POS query inputs to integers (frappe#32975) fix: cast POS query inputs to integers (cherry picked from commit c013db6) # Conflicts: # erpnext/selling/page/point_of_sale/point_of_sale.py * chore: conflicts Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit e81bec5)
…fix/pr-32989 ci: fix flake8 URL (backport frappe#32989)
## [13.43.1](frappe/erpnext@v13.43.0...v13.43.1) (2023-01-10) ### Bug Fixes * better handling of duplicate bundle items ([0b952e8](frappe@0b952e8)) * remove hard-coded roles for populating leave balance reports ([frappe#249](frappe#249)) ([frappe#33557](frappe#33557)) ([c20d469](frappe@c20d469)) * remove unnecessary permissions from Appointment and Appointment Booking Settings ([frappe#33468](frappe#33468)) ([a50ad1d](frappe@a50ad1d))
…fix/pr-33597 fix: don't check other warehouse ledgers to calculate valuation rate (backport frappe#33597)
(cherry picked from commit be05aea)
…fix/pr-33611 fix: better comparision of `difference_value` of Stock and Account (backport frappe#33611)
…checked in pick list (backport frappe#33627) (frappe#33631) fix: only group similar items in print format if group_same_items is checked in pick list (frappe#33627) * fix: only group similar items if group same items is checked in pick list * test: non grouping of locations if group_same_items is false Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com> (cherry picked from commit cfb0bb1) Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
…port frappe#33636) (frappe#33638) chore: reuse doc object in test_pick_list_grouping_before_print (frappe#33636) (cherry picked from commit e22d564) Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
…ssion (cherry picked from commit 391f42d)
…fix/pr-33622 fix: Updating SO throws ordered_qty not allowed to change after submission (backport frappe#33622)
fix: asset value in fixed asset register (cherry picked from commit aa1f2a7) Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
(cherry picked from commit b375989)
fix: Return against internal purchase invoice (frappe#33635) (cherry picked from commit 906ad10) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
'ordered_qty' will not be fetched from `tabBin` (cherry picked from commit be38205)
…er submission" (frappe#33646) (cherry picked from commit 333907b)
fix: allow to create sales order from expired quotation (frappe#33582) (cherry picked from commit dceef03) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
…fix/pr-33664 chore: `Sales Order` link in `Pick List` (backport frappe#33664)
…fix/pr-33662 revert: Reverting changes done on 33495 (backport frappe#33662)
…fix/pr-33646 Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (backport frappe#33646)
(cherry picked from commit e19161a)
…fix/pr-33690 fix: Sales Order Connections Tabs do not show linked Material Request or "+" button (intoduce by frappe#33304) (backport frappe#33690)
fix: handle asset depr entries posting failure and fix asset repair link [v13]
chore: release v13
## [13.43.2](frappe/erpnext@v13.43.1...v13.43.2) (2023-01-17) ### Bug Fixes * allow to create sales order from expired quotation ([frappe#33582](frappe#33582)) ([2f81f15](frappe@2f81f15)) * asset value in fixed asset register ([frappe#33608](frappe#33608)) ([42fe63d](frappe@42fe63d)) * better comparision of difference value between stock and account ([a450c8d](frappe@a450c8d)) * don't check other warehouse ledgers to calculate valuation rate ([66bf107](frappe@66bf107)) * handle post depr entries fail and fix asset repair link ([5f7dc8a](frappe@5f7dc8a)) * only group similar items in print format if group_same_items is checked in pick list (backport [frappe#33627](frappe#33627)) ([frappe#33631](frappe#33631)) ([7dcf0f0](frappe@7dcf0f0)) * Return against internal purchase invoice ([frappe#33635](frappe#33635)) ([eef0f45](frappe@eef0f45)) * Sales ORder Connections on Material Request ([97488ae](frappe@97488ae)) * Updating SO throws ordered_qty not allowed to change after submission ([a46aa80](frappe@a46aa80)) ### Reverts * Reverting changes done on 33495 ([frappe#33662](frappe#33662)) ([0f0a2b1](frappe@0f0a2b1))
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.
Changelogs: