Merge from upstream v14 #77
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
(cherry picked from commit 769db0b)
…fix/pr-37055 fix: Apply dimension filter, irrespective of dimension columns (frappe#37055)
…e#36980) (frappe#37070) fix: move SI and DI connected links to internal_and_external_links (cherry picked from commit e1a94a9) Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
…frappe#36973) (frappe#37071) * fix: ignore user permissions for `From Warehouse` in PR (cherry picked from commit d2f3286) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json * chore: `conflicts` * chore: `conflicts` --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
…ppe#37046) (frappe#37068) * fix: Purchase Receipt Provisional Accounting GL Entries (cherry picked from commit 6bab0ee) * test: Purchase Receipt Provisional Accounting GL Entries (cherry picked from commit 1c78a5a) * fix(test): PR Provisional Accounting --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: Remove redundant code (frappe#37001) fix: Remove redundant code (cherry picked from commit 96363db) Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
(cherry picked from commit 097b989)
…fix/pr-37108 fix: asset validation misfire on debit notes (backport frappe#37108)
…rappe#37102) (frappe#37110) fix: ignore user permissions for `Source Warehouse` in MR (frappe#37102) fix: ignore user permissions for Source Warehouse in MR (cherry picked from commit fc01668) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: validate duplicate serial no in DN
* fix: company wise deferred accounting fields in item (frappe#37023) * fix: move deferred accounts in accounting section * fix: move deferred check boxes in item accounting * fix: show company wise acc in filters * fix: fetch item deferred account from child table * fix: tests using deferred acc * refactor: use cached value * fix: cached value call * feat: patch to migrate deferred acc * fix: hardcode education module doctypes in patch * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 099468e) # Conflicts: # erpnext/patches.txt # erpnext/patches/v14_0/delete_education_doctypes.py # erpnext/stock/doctype/item/item.json * chore: resolve conflicts * chore: resolve conflicts --------- Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 1b78fae) # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json
(cherry picked from commit 23fbe86)
…fix/pr-33502 feat: Toggle display of Account Balance in Chart of Accounts (backport frappe#33502)
* fix: Don't allow merging accounts with different currency (frappe#37074) * fix: Don't allow merging accounts with different currency * test: Update conflicting values * test: Update conflicting values (cherry picked from commit 5e21e7c) # Conflicts: # erpnext/accounts/doctype/account/account.js # erpnext/accounts/doctype/account/account.py * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 9004721)
…fix/pr-37127 refactor: better date filters in `Get Outstanding Invoices` dialog (backport frappe#37127)
* fix: added validation for duplicate serial nos in pos * chore: code cleanup * chore: code cleanup * fix: removed duplicate batch number validation * chore: code cleanup
…frappe#37131) (frappe#37137) * refactor: replace 'customer' filter with 'party_type' and 'party' (cherry picked from commit ac650d2) * chore: remove stale code (cherry picked from commit 083c82c) * refactor(test): AR output filtered on USD customers (cherry picked from commit 08d91ab) --------- Co-authored-by: ruthra kumar <ruthra@erpnext.com>
fix: POS opening issue because of Product Bundle
…ort (backport frappe#37115) (frappe#37147) feat: provision to create RIV from `Stock Ledger Invariant Check` report (frappe#37115) * feat: provision to create RIV from `Stock Ledger Invariant Check` report * fix: `linter` (cherry picked from commit 9c9d0ec) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
…fix/pr-37319 test: use fixtures for sales and purchase invoice (backport frappe#37319)
…7414) (frappe#37514) fix: consider received qty while creating SO -> MR (cherry picked from commit b2cee39) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
) (frappe#37516) * fix: GL Entries not getting created for PR Return (cherry picked from commit 46add06) * test: add test case for PR return with zero rate (cherry picked from commit 253d478) # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py * chore: `conflicts` --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
… (frappe#37530) * perf: index `dn_detail` in `Delivery Note Item` (cherry picked from commit 5b4528e) # Conflicts: # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json * chore: `conflicts` --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit d2096cf)
…fix/pr-37532 fix: keep customer/supplier website role by default (backport frappe#37532)
fix: Incorrect vat amount in KSA VAT report
(cherry picked from commit 0831552)
…fix/pr-37330 refactor: checkbox to toggle exchange rate inheritence in PO->PI (backport frappe#37330)
* fix: same Serial No get mapped while creating SO -> DN * test: add test case for DN with repetitive serial item
fix(test): project test case (cherry picked from commit fd6aee1) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit e31db18) # Conflicts: # erpnext/patches.txt
(cherry picked from commit 601ab45)
(cherry picked from commit 244cec6)
…fix/pr-37549 refactor: use account in key while grouping voucher in ar/ap report (backport frappe#37549)
…rder item. (backport frappe#37539) (frappe#37558) fix: billed_qty to show a sum of all invoiced qty from the purchase order item. (cherry picked from commit 8a72f4f) Co-authored-by: HarryPaulo <paulo_fabris@hotmail.com>
(cherry picked from commit f2b0ac6)
(cherry picked from commit 94ce43b)
…fix/pr-37105 refactor: move `unreconcile` button into a drop down (backport frappe#37105)
…fix/pr-37550 chore: Add accounting dimensions to Sales Order Item table (backport frappe#37550)
* fix: E-commerce permissions (cherry picked from commit f4d7499) # Conflicts: # erpnext/controllers/selling_controller.py * chore: conflicts --------- Co-authored-by: Ankush Menat <ankush@frappe.io>
frappe#37575) fix: payment entry count on supplier dashboard (frappe#37571) (cherry picked from commit 10311ff) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
…rappe#37565) (frappe#37577) * fix: Issues related to RFQ and Supplier Quotation on Portal (frappe#37565) fix: RFQ and Supplier Quotation for Portal (cherry picked from commit 2851a41) * chore: removed backport changes --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
chore: release v14
## [14.44.1](frappe/erpnext@v14.44.0...v14.44.1) (2023-10-19) ### Bug Fixes * billed_qty to show a sum of all invoiced qty from the purchase order item. (backport [frappe#37539](frappe#37539)) ([frappe#37558](frappe#37558)) ([ac7d6d6](frappe@ac7d6d6)) * consider received qty while creating SO -> MR (backport [frappe#37414](frappe#37414)) ([frappe#37514](frappe#37514)) ([1b94510](frappe@1b94510)) * don't set finance books if gross_purchase_amount is not set (backport [frappe#37480](frappe#37480)) ([frappe#37482](frappe#37482)) ([0590f21](frappe@0590f21)) * e-commerce permissions for address ([frappe#37554](frappe#37554)) ([022f85d](frappe@022f85d)) * german tranlations of "Is Return" ([f9b2355](frappe@f9b2355)) * GL Entries not getting created for PR Return (backport [frappe#37513](frappe#37513)) ([frappe#37516](frappe#37516)) ([c32258e](frappe@c32258e)) * **gp:** wrong `allocated_amount` on multi sales person invoice ([d266423](frappe@d266423)) * Incorrect vat amount in KSA VAT report ([44f7de0](frappe@44f7de0)) * inflated total amt in TDS report using back calculation ([78e22af](frappe@78e22af)) * Issues related to RFQ and Supplier Quotation on Portal (backport [frappe#37565](frappe#37565)) ([frappe#37577](frappe#37577)) ([e1504ef](frappe@e1504ef)) * keep customer/supplier website role by default ([76ef61c](frappe@76ef61c)) * keyerror on gl and pl comparision report ([6f143d3](frappe@6f143d3)) * payment entry count on supplier dashboard (backport [frappe#37571](frappe#37571)) ([frappe#37575](frappe#37575)) ([95abd79](frappe@95abd79)) * same Serial No get mapped while creating SO -> DN ([frappe#37527](frappe#37527)) ([5025850](frappe@5025850)) * serial and batch no get removed on save of return DN ([frappe#37476](frappe#37476)) ([f1814a1](frappe@f1814a1)) * Stock Reconciliation Insufficient Stock Error ([frappe#37494](frappe#37494)) ([9406ddb](frappe@9406ddb)) * **test:** project test case (backport [frappe#37541](frappe#37541)) ([frappe#37543](frappe#37543)) ([e23710b](frappe@e23710b)) * use `flt` to ignore TypeError ([frappe#37481](frappe#37481)) ([d2b22db](frappe@d2b22db)) ### Performance Improvements * index `dn_detail` in `Delivery Note Item` (backport [frappe#37528](frappe#37528)) ([frappe#37530](frappe#37530)) ([001c230](frappe@001c230))
Alchez
merged commit f7d47f2
into
ParsimonyGit:parsimony-production-v14
4 of 9 checks passed
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: