chore: release v13 #34812
Merged
chore: release v13 #34812
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
* feat(asset_maintenance.json):Add 3 yearly in periodicity dropdown * add server side implications for 3 yearly
fix: lost opportunity report issue (#34626) * fix: lost opportunity report issue * chore: Linting Issues --------- Co-authored-by: Komal Saraf <komal@frappe.io> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit d0660ad) Co-authored-by: Komal-Saraf0609 <81952590+Komal-Saraf0609@users.noreply.github.com>
(cherry picked from commit 2b0470d)
(cherry picked from commit 17131e5)
…-34649 fix: incorrect arg name in asset value adjustment (backport #34649)
…-34648 fix: serial no with zero quantity issue in stock reco (backport #34648)
* chore: improve asset depr posting error msg * chore: add period * chore: improve msg (cherry picked from commit d999dea)
(cherry picked from commit cbdaab9)
(cherry picked from commit 345e6fa)
…-34661 chore: improve asset depr posting failure msg (backport #34661)
…-34636 fix: posting time issue (backport #34636)
…-34664 fix: incorrect balance qty in the stock ledger report (backport #34664)
…on Plan (cherry picked from commit 706be2a) # Conflicts: # erpnext/manufacturing/doctype/production_plan/production_plan.json
…-34677 chore: make `Production Plan Item Reference` table hidden in Production Plan (backport #34677)
(cherry picked from commit 986daa6)
…-34679 fix: enclose ternary operator in parenthesis (backport #34679)
(cherry picked from commit a4112c7)
…-34656 fix: BOM Update Cost, when no actual qty (backport #34656)
(cherry picked from commit d560703)
…-34715 fix: bom update log not working for large batch size (backport #34715)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
fix: monthly wdv and dd schedule
…34287) * fix: Taxes aren't discounted on early payment discount - Deductions in payment entry must be split into income loss and tax loss - Compute total discount in percentage, makes discounting different amounts proportionately easier (cherry picked from commit 768c3a4) * fix: Recalculate difference amount after setting deductions (cherry picked from commit 75ec0a0) * fix: Set deductions in base currency - Use field precision to get more accurate values (cherry picked from commit dc2998f) * fix: Back update discounted amount in Invoice based on discount type - Discount value was always trated as a percentage on back updation (cherry picked from commit 2ae5834) * test: PE from SI with early payment discount amount & PE assertions in discount % test (cherry picked from commit c217bb2) * fix: Set deduction amount in company currency on Doctype - Even via JS, deductions amount is always in company currency - Since there is nothing dynamic about this field, set it in the doctype spec itself - fixed: Inconsistency between label currency and field currency formatted value (cherry picked from commit 7f2e7ba) * fix: Don't add to deductions if amount is 0 - misc: better docstring (cherry picked from commit f02fc8a) * fix: Paid amount must be discounted considering accounting currency - Accounting is in the same currency if party currency and company currency is the same - If accounting is in the same currency, paid and recvd amount is in the base currency - Then, discount amount must also be in the base currency as it is deducted from paid amount - Received amount must be in base currency if not multi currency - cleanup: Deductions setting broken into smaller functions (cherry picked from commit 761f68d) * fix: Multi-currency SI with base currency PE - Return total discount loss in base currency - Allocate payment based on terms: Set allocated amount in references table in base currency if accounting is in that currency - Allocate payment based on terms: While back updating set paid amount (payment schedule) in transaction currency always - minor: discount msgprint in correct currency (cherry picked from commit b09c238) * test: Multi currency SI with multi-currency accounting and single currency accounting + Early payment discount (cherry picked from commit 9abf0ef) # Conflicts: # erpnext/accounts/doctype/payment_entry/test_payment_entry.py * fix: Handle rounding more gracefully - Round off pending discount loss to avoid miniscule losses rounded to 0.0 that are added in deductions - Use base amounts to calculate base losses instead of using conversion factor which increases rounding error - Round of total base loss instead of individual income and tax losses to reduce rounding error - Use default round off account for pending rounding loss in deductions (cherry picked from commit caa1a3d) * fix: Provision to apply early payment discount if payment is recorded late - Party could have paid on time but payment is recorded late - Prompt for reference date so that discount is applied while mapping - Prompt only if discount in payment schedule of valid doctypes - test: Reference date and impact on PE - `make_payment_entry` (JS) must be able to access `this` (cherry picked from commit d6d0163) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.py # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js # erpnext/buying/doctype/purchase_order/purchase_order.js # erpnext/public/js/controllers/transaction.js * feat: Make Tax loss booking optional - Checkbox in Accounts Settings - Apply checkbox in PE deductions setting logic - Adjust tests (cherry picked from commit 216a46b) # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json * fix: Merge conflicts * fix: 'Donation' does not have `company_currency` field - Make sure check uses this field only for eligible documents --------- Co-authored-by: marination <maricadsouza221197@gmail.com>
fix: don't include cancelled JVs in assdeprledger report (cherry picked from commit 3896d41) Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
fix!: require sender and message for contact us page (#34707) * fix: require sender and message for contact us page * refactor: dont override frappe.send_message from client side used override_whitelisted_method hook for the same (cherry picked from commit f193393) Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
frappe-pr-bot
requested review from
nextchamp-saqib,
marination,
ruchamahabal,
rohitwaghchaure,
s-aga-r,
deepeshgarg007,
ruthra-kumar and
anandbaburajan
as code owners
|
🎉 This PR is included in version 13.49.12 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
Automated weekly release.