Merge from upstream v14 #69
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
Bug Fixes
Features
ChoreContributorsdeepeshgarg007, s-aga-r, rohitwaghchaure, barredterra, mergify[bot] Commit-Lint commandsYou can trigger Commit-Lint actions by commenting on this PR:
|
…fix/pr-33103 fix: job card "Qty to Manufacture" UX (backport frappe#33103)
…fix/pr-33092 fix: Debit and Credit not equal while submitting PI containing asset item (backport frappe#33092)
(cherry picked from commit df0fee2)
(cherry picked from commit fe87c27)
…fix/pr-33090 fix: MR Item `item_name` and `description` gets reset on `qty` change (backport frappe#33090)
(cherry picked from commit 87b39f0)
(cherry picked from commit 2e4f3e9)
(cherry picked from commit 4811498)
(cherry picked from commit ef7fd67)
(cherry picked from commit 8cb7112)
…fix/pr-33120 fix: `Work Order Summary` and `Job Card Summary` Report (backport frappe#33120)
…fix/pr-33118 fix: production plan UX (backport frappe#33118)
…fix/pr-33111 fix: Loan disbursable amount on current security price (backport frappe#33111)
(cherry picked from commit 1a1bfc8)
(cherry picked from commit d2563ee) # Conflicts: # erpnext/patches.txt
(cherry picked from commit ce83f02)
(cherry picked from commit 029f22c) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json
(cherry picked from commit 7710530) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
(cherry picked from commit ffd287d)
(cherry picked from commit a5966b6)
(cherry picked from commit 491857b)
…) (frappe#33131) fix: opportunity list doesn't show assigned user (frappe#33110) Because `db_update` is performed `_assign` property is not updated and hence lead -> opportunity conversion makes it disappear from list view. Steps to reproduce: 1. Create lead 2. Assign anyone 3. Create opportunity from lead. 4. Form view shows assigned user, list view wont. (cherry picked from commit 63b9795) Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 4f2ece3)
(cherry picked from commit e02f35c)
…fix/pr-33135 feat: make Material Request for sub-assembly items (backport frappe#33135)
…fix/pr-33380 fix: ERR journals should be reported in AR/AP (backport frappe#33380)
(cherry picked from commit 6f5824c)
…fix/pr-33465 fix: `fg_item_qty` in non-subcontracted PO (backport frappe#33465)
…e#33469) (frappe#33470) fix(pricing rule): consider child tables in condition (frappe#33469) (cherry picked from commit cabaed9) Co-authored-by: Dany Robert <rtdany10@gmail.com>
(cherry picked from commit e3a0ce5)
…fix/pr-33457 fix: use base_net_amount in case of missing stock qty (backport frappe#33457)
…es having incorrect valuation" (cherry picked from commit 728dc1a)
…fix/pr-33487 Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation" (backport frappe#33487)
…penses) (frappe#32714) fix: Conversion factor error for invoices without item code (petty expenses) (frappe#32714) * fix: Set default uom conversion factor to 1 for invoices * chore: set default conversion_factor as 1 * chore: remove print statements (cherry picked from commit 6175183) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: Multi-currency issues in Bank Recociliation Tool (cherry picked from commit ad53ecf) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 8d62cdf)
(cherry picked from commit 239a5f8)
(cherry picked from commit c716dcc)
(cherry picked from commit c3911a5)
…fix/pr-33495 fix(stock): missing ordered_qty in get_bin_details (backport frappe#33495)
…fix/pr-33444 fix: consider child nodes while getting bin details (backport frappe#33444)
…unt balance (frappe#33165) refactor: Exchange rate revaluation to handle accounts with zero account balance (frappe#33165) * refactor: new type for JE - Exchange Gain or Loss * refactor: skip few validations for Exchanage Gain Or Loss type Jour * refactor: ERR create 2 journals for handling zero and non-zero compa 1. Additional check box accounts table to identify accounts with zero balance 2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal * refactor: skips few validation for allowing 0 debit/credit * fix: General Ledger presentaion currency * test: fix test case in general ledger * test: fix failing test case in AR report (cherry picked from commit 914b230) Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit aba8384)
…fix/pr-33504 fix: [concurrency issue] incorrect picked qty in sales order (backport frappe#33504)
fix: Deferred revenue date comparison (frappe#33515) (cherry picked from commit a3ab8f9) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 751bdc9)
…fix/pr-33514 fix: set `supplier` details while mapping SE(Send to Subcontractor) (backport frappe#33514)
…port frappe#33518) (frappe#33525) fix: Get payment entry button not visible in Bank Clearance doc (frappe#33518) (cherry picked from commit 1a83a67) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…rappe#33526) fix: Missing opening entry in general ledger (frappe#33519) (cherry picked from commit c78399c) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
chore: release v14
# [14.12.0](frappe/erpnext@v14.11.1...v14.12.0) (2023-01-04) ### Bug Fixes * [concurrency issue] incorrect picked qty in sales order ([e7254fd](frappe@e7254fd)) * `fg_item_qty` in non-subcontracted PO ([6e15331](frappe@6e15331)) * `shipping_address` for non-drop shipping item ([a7a3654](frappe@a7a3654)) * `shipping_address` in PO ([448fbe5](frappe@448fbe5)) * add missing 'ordered_qty' to get_bin_details ([55e8e45](frappe@55e8e45)) * consider child nodes while getting bin details ([e296408](frappe@e296408)) * Conversion factor error for invoices without item code (petty expenses) ([frappe#32714](frappe#32714)) ([ba5a149](frappe@ba5a149)) * Customer Primary Contact (backport [frappe#33424](frappe#33424)) ([frappe#33440](frappe#33440)) ([73c9820](frappe@73c9820)) * Default dimensions on fetching items from BOM (backport [frappe#33439](frappe#33439)) ([frappe#33459](frappe#33459)) ([a332b22](frappe@a332b22)) * Deferred revenue date comparison ([frappe#33515](frappe#33515)) ([027510b](frappe@027510b)) * ERR journals reported in AR/AP ([823b352](frappe@823b352)) * Get payment entry button not visible in Bank Clearance doc (backport [frappe#33518](frappe#33518)) ([frappe#33525](frappe#33525)) ([fcf052d](frappe@fcf052d)) * Missing opening entry in general ledger (backport [frappe#33519](frappe#33519)) ([frappe#33526](frappe#33526)) ([8e375db](frappe@8e375db)) * Multi-currency issues in Bank Reconciliation Tool ([frappe#33488](frappe#33488)) ([d030852](frappe@d030852)) * Multiple rows for same warehouse and batches in pick list (backport [frappe#33456](frappe#33456)) ([frappe#33458](frappe#33458)) ([a166a76](frappe@a166a76)) * payment terms and sales partner filter issue in AR/AP report ([0f6790b](frappe@0f6790b)) * **pricing rule:** consider child tables in condition (backport [frappe#33469](frappe#33469)) ([frappe#33470](frappe#33470)) ([3bceb47](frappe@3bceb47)) * Random behaviour while picking items using picklist (backport [frappe#33449](frappe#33449)) ([frappe#33450](frappe#33450)) ([1edde9c](frappe@1edde9c)) * set `supplier` details while mapping SE(Send to Subcontractor) ([06e13b6](frappe@06e13b6)) * timeout error while submitting stock entry ([f30f77c](frappe@f30f77c)) * typerror on multi warehouse in Packed Items ([9b24940](frappe@9b24940)) * use base_net_amount in case of missing stock qty ([frappe#33457](frappe#33457)) ([88ca780](frappe@88ca780)) ### Features * Accounting Dimension updation in Payment Request and Entry ([frappe#33411](frappe#33411)) ([e7704b2](frappe@e7704b2))
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: