Merge from upstream v14 #72
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
…fix/pr-34053 fix: rename duplicate field name with same type into a DocType to avoid import Error (backport frappe#34053)
(cherry picked from commit 156e459)
…fix/pr-34091 fix: incorrect consumed qty in subcontracting receipt (backport frappe#34091)
…b_v14 fix: repair status after deletion, asset status after manual depr entry and other misc bugs [v14]
(cherry picked from commit d7ef5ad)
(cherry picked from commit 20bdc63)
…fix/pr-34077 fix: show Purchase Order Portal `Pay` button based on configuration (backport frappe#34077)
…use based reposting (cherry picked from commit f1383b5)
…fix/pr-34115 feat: provision to convert transaction based reposting to item wareho… (backport frappe#34115)
…pe#34130) fix: forced delete linked desktop_icons (frappe#34107) * fix: forced delete linked desktop_icons * fix: black (cherry picked from commit 5e48e61) Co-authored-by: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
…pe#34110) fix: consider rounded total amount while making payment request (frappe#34110) (cherry picked from commit 9c6466f) Co-authored-by: ruthra kumar <ruthra@erpnext.com>
…appe#34054) fix: ignore repost payment ledger on basic documents cancellation (frappe#34054) fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit c722f28) Co-authored-by: ruthra kumar <ruthra@erpnext.com>
fix: differency entry journal debit/credit missing (frappe#34104) * fix: difference entry journal is wrong * fix: difference entry journal is wrong (cherry picked from commit 183e42a) Co-authored-by: Alirio Castro <aliriocastro@gmail.com>
(cherry picked from commit 92d857d)
…or stock ledger report (cherry picked from commit 0e388ba)
…fix/pr-33722 fix: purchase invoice performance issue (backport frappe#33722)
…fix/pr-34139 fix: inventory dimension filter not overriding with existing filter for stock ledger report (backport frappe#34139)
(cherry picked from commit 1b010ad)
(cherry picked from commit 44ee9f0)
…fix/pr-34138 fix(ux): `ReferenceError: me is not defined` Delivery Note (backport frappe#34138)
(cherry picked from commit 76861eb)
…fix/pr-34153 fix: fiscal year error for existing assets in fixed asset register (backport frappe#34153)
* feat: Editable Sales Invoice (cherry picked from commit 30da6ab) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json * chore: Update allow on submit for Sales Invoice fields (cherry picked from commit e626107) # Conflicts: # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json * chore: Break into smaller functions (cherry picked from commit 42e4c37) * chore: Update allow on submit fields (cherry picked from commit 1105e52) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json * test: Add unit tests (cherry picked from commit ed98015) * chore: Update tests (cherry picked from commit 1a98012) * chore: Reset repost_required_flag on cancel (cherry picked from commit 0966867) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.py * chore: Enable no-copy for repost required field (cherry picked from commit 5fe5517) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json * chore: Validate for deferred revenue invoices (cherry picked from commit e29f756) * chore: Resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: Use normal rounding for Tax Withholding Category (frappe#34114) (cherry picked from commit 35cdd99) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: Filters in item-wise sales history report (frappe#34145) (cherry picked from commit c88444a) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…rappe#34109) refactor: clear records in batches in 'Transaction Deletion Record' (frappe#34109) refactor: clear records in batches (cherry picked from commit 4a7b1de) Co-authored-by: ruthra kumar <ruthra@erpnext.com>
chore: reorder migration patches. 'migrate_gl_to_payment_ledger', 'migrate_remarks_from_gl_to_payment_ledger' should always run last. (cherry picked from commit 6820263) Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 47add0b)
…fix/pr-34102 fix: check for duplicate pos invoices in closing entry (backport frappe#34102)
…appe#34577) 1. 'Party type' and 'Party' filters have been added 2. checkbox to include Amount in Acccount Currency 3. Grouping vouchers on Party 4. Replaced Company with Posting Date (cherry picked from commit f7780cd)
…fix/pr-34577 refactor: additional filters and columns in Payment Ledger report (backport frappe#34577)
feat: deprecate get_customer_list (frappe#34563) (cherry picked from commit 8c7fa57) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix: default pos conversion factor set to 1 (frappe#34437) (cherry picked from commit 08fc686) # Conflicts: # erpnext/selling/page/point_of_sale/point_of_sale.py * chore: Resolve conflicts --------- Co-authored-by: Shram Kadia <65490105+Shram007@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe#34597) fix: Party Name in SOA print when viewed from Customer/Supplier master (frappe#34597) fix: Party Name in SOA print when viewd from Customer/Supplier master (cherry picked from commit 50c1172) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: Percentage billing in Sales Order (frappe#34606) (cherry picked from commit 12ad2aa) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…pe#34475) fix: don't get zero value entries for exchange rate calculation (frappe#34475) * fix: multiply None by float * chore: remove debug (cherry picked from commit 393bc25) Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
(cherry picked from commit d52f7e2)
…tem whoes tax template set (frappe#34525) fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set (frappe#34525) * fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set * fix: minor change added (cherry picked from commit 7aafc90) Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
…fix/pr-34608 chore: removing redundant validation (backport frappe#34608)
(cherry picked from commit b04a101)
…fix/pr-34461 fix: incorrect `Opening Value` in `Stock Balance` report (backport frappe#34461)
…rappe#34623) fix: zero rm-cost for batch rm item in SCR (frappe#34616) fix: `0` rm-cost for batch rm item in SCR (cherry picked from commit 867d898) Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
chore: release v14
# [14.20.0](frappe/erpnext@v14.19.0...v14.20.0) (2023-03-28) ### Bug Fixes * default pos conversion factor set to 1 ([frappe#34437](frappe#34437)) ([18d813a](frappe@18d813a)) * don't get zero value entries for exchange rate calculation ([frappe#34475](frappe#34475)) ([ff24b3e](frappe@ff24b3e)) * incorrect `Opening Value` in `Stock Balance` report ([76b782a](frappe@76b782a)) * Note username overlapping with note content(CRM) ([096e5ef](frappe@096e5ef)) * Party Name in SOA print when viewed from Customer/Supplier master ([frappe#34597](frappe#34597)) ([835edbe](frappe@835edbe)) * Percentage billing in Sales Order ([frappe#34606](frappe#34606)) ([477cb12](frappe@477cb12)) * recalculate WDV rate after asset repair [v14] ([frappe#34571](frappe#34571)) ([d2ca6f8](frappe@d2ca6f8)) * remove unused translation ([frappe#34519](frappe#34519)) ([881e92e](frappe@881e92e)) * removing redundant validation ([fd6db41](frappe@fd6db41)) * Sales person variance report without item group ([frappe#34552](frappe#34552)) ([90ddc4a](frappe@90ddc4a)) * Tax Category not able to set hence it calculating zero tax for item whoes tax template set ([frappe#34525](frappe#34525)) ([a8567b0](frappe@a8567b0)) * Time button not working in the job card ([8fed33b](frappe@8fed33b)) * translations and UX in alternative item mapping ([frappe#34433](frappe#34433)) ([702d07e](frappe@702d07e)) * unset address and contact on trash (backport [frappe#34495](frappe#34495)) ([frappe#34560](frappe#34560)) ([db01bf5](frappe@db01bf5)) * zero rm-cost for batch rm item in SCR (backport [frappe#34616](frappe#34616)) ([frappe#34623](frappe#34623)) ([cff35d7](frappe@cff35d7)) ### Features * deprecate get_customer_list ([frappe#34563](frappe#34563)) ([67576ad](frappe@67576ad))
…34719 fix: bom update log not working for large batch size (backport frappe#34715) (backport frappe#34719)
## [14.20.1](frappe/erpnext@v14.20.0...v14.20.1) (2023-04-03) ### Bug Fixes * bom update log not working for large batch size ([da35436](frappe@da35436))
…34758 fix: incorrect stock balance quantity for batch item (backport frappe#34743) (backport frappe#34758)
## [14.20.2](frappe/erpnext@v14.20.1...v14.20.2) (2023-04-05) ### Bug Fixes * incorrect stock balance quantity for batch item ([c7cee86](frappe@c7cee86))
…e#34762) fix: Unable to create payment request against purchase invoice (frappe#34762) fix: Unable to create payment request against purchase invoice (frappe#34762) (cherry picked from commit 91a2660) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit a1f7e35) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
## [14.20.3](frappe/erpnext@v14.20.2...v14.20.3) (2023-04-06) ### Bug Fixes * Unable to create payment request against purchase invoice ([frappe#34762](frappe#34762)) ([f4473b3](frappe@f4473b3))
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.
After merge, also merge https://github.com/ParsimonyGit/parsimony/pull/403.
Changelogs: