forked from frappe/erpnext
-
Notifications
You must be signed in to change notification settings - Fork 6
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
Version 13 #139
Merged
Merged
Version 13 #139
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
Owner
asoral
commented
Sep 29, 2023
(cherry picked from commit 61f0513) # Conflicts: # erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
(cherry picked from commit be15419) # Conflicts: # erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
(cherry picked from commit b482e38)
(cherry picked from commit 88a0aa4)
…-33013 fix: validate repost item valuation against accounts freeze date (backport #33013)
(cherry picked from commit f751727) # Conflicts: # erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py # erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
…-35118 fix: don't allow to make reposting for the closed period (backport #35118)
fix: allow user to set standard deductions in income tax slab without allowing other exemptions
chore: release v13
# [13.50.0](v13.49.14...v13.50.0) (2023-05-03) ### Bug Fixes * allow user to set standard deductions in income tax slab without allowing other exemptions ([c5261cd](c5261cd)) * check for session user rather than owner ([7d6e2f9](7d6e2f9)) * conflicts ([778ba69](778ba69)) * conflicts ([b19b0a4](b19b0a4)) * conflicts ([6bdf143](6bdf143)) * don't allow to make reposting for the closed period ([b31d8ee](b31d8ee)) * handle expected_value_after_useful_life properly in asset value adjustment (backport [#35117](#35117)) ([#35120](#35120)) ([635559d](635559d)) * handle finance book properly in trial balance and general ledger ([#35136](#35136)) ([9a37603](9a37603)) * Hyperlink in Quality Inspection Summary ([54388e8](54388e8)) * Naming series error in Journal Entry template ([#35084](#35084)) ([d3c769c](d3c769c)) * per_billed condition for Payment Entry ([#34969](#34969)) ([563e5c0](563e5c0)) * test case ([db6d0e0](db6d0e0)) ### Features * validate repost item valuation against accounts freeze date ([a852dc1](a852dc1))
…backport #35192) (#35195) fix: handle empty FBs properly in TB and GL [v14] (backport #35189) (#35192) fix: handle empty FBs properly in TB and GL [v14] (#35189) fix: handle empty FBs properly in TB and GL (cherry picked from commit ed5f39c) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> (cherry picked from commit e2af66c) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
chore: release v13
(cherry picked from commit b5a2ccf)
…-35158 fix: internal transfer condition (backport #35158)
## [13.50.3](v13.50.2...v13.50.3) (2023-05-11) ### Bug Fixes * internal transfer condition ([ac26e4b](ac26e4b))
(cherry picked from commit d16caa2)
…-35275 fix: add missing options for `Content Align` (backport #35275)
(cherry picked from commit 64614cd) # Conflicts: # erpnext/stock/doctype/delivery_note/test_delivery_note.py
…-36590 fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
(cherry picked from commit dbd3fdb)
(cherry picked from commit 64614cd) # Conflicts: # erpnext/stock/doctype/delivery_note/test_delivery_note.py
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
## [13.52.11](v13.52.10...v13.52.11) (2023-08-17) ### Bug Fixes * disallow mulitple SO with same PO No ([bdaae81](bdaae81))
chore: release v13
chore: patch to correct asset values if je has workflow
…count fields (#36949) * fix: update repay_from_salary, payment_account and payroll_payable_account fields * chore: formatting
#36972) fix: ask for asset related accounts only when needed (#36960) * fix: only ask for asset_received_but_not_billed account when needed * chore: remove unnecessary if condition * fix: only ask for expenses_included_in_asset_valuation account when needed (cherry picked from commit 174f95d) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
chore: release v13
## [13.52.13](v13.52.12...v13.52.13) (2023-09-06) ### Bug Fixes * ask for asset related accounts only when needed (backport [#36960](#36960)) ([#36972](#36972)) ([3a71fa9](3a71fa9)) * update repay_from_salary, payment_account and payroll_payable_account fields ([#36949](#36949)) ([6f40d0c](6f40d0c))
(cherry picked from commit fc79af5)
…-36953 fix: prorate factor for subscription plan (#36953)
fix: prorate factor for subscription plan (#36953)
## [13.52.14](v13.52.13...v13.52.14) (2023-09-10) ### Bug Fixes * prorate factor for subscription plan ([#36953](#36953)) ([d7f09f8](d7f09f8))
chore: release v13
## [13.52.15](v13.52.14...v13.52.15) (2023-09-12) ### Bug Fixes * prorate factor for subscription plan ([#36953](#36953)) ([9a15ed8](9a15ed8))
…ort (backport #37115) (#37149) * feat: provision to create RIV from `Stock Ledger Invariant Check` report (#37115) * feat: provision to create RIV from `Stock Ledger Invariant Check` report * fix: `linter` (cherry picked from commit 9c9d0ec) # Conflicts: # erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py * chore: `conflicts` --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: fetch logic for repay_from_salary in loan_repayment
chore: release v13
# [13.53.0](v13.52.15...v13.53.0) (2023-09-19) ### Bug Fixes * fetch logic for repay_from_salary in loan_repayment [v13] ([#37136](#37136)) ([d4f8b05](d4f8b05)) ### Features * provision to create RIV from `Stock Ledger Invariant Check` report (backport [#37115](#37115)) ([#37149](#37149)) ([86b152f](86b152f))
* feat: provision to make reposting entries from Stock and Account Value Comparison Report (backport #35365) (#37171) * feat: provision to make reposting entries from Stock and Account Value Comparison Report (cherry picked from commit 7b818e9) * fix: `linter` * fix(ux): throw if no row selected to create repost entries --------- Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com> * fix: incorrect stock ledger entries in DN (backport #36944) (#37067) * fix: incorrect stock ledger entries in DN (#36944) (cherry picked from commit 0e83190) # Conflicts: # erpnext/stock/doctype/delivery_note/delivery_note.json * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * feat: `Stock Ledger Variance` report (backport #37165) (#37184) feat: `Stock Ledger Variance` report (#37165) * feat: `Stock Ledger Variance` report * refactor: `get_data()` (cherry picked from commit acda72d) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com> * fix: Update `advance_paid` in SO/PO after unlinking from advance entry (cherry picked from commit 426350e) * test: Impact on SO of advance PE submit and unlinking/replacement by SI (cherry picked from commit 8a4954d) --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: ruthra kumar <ruthra@erpnext.com>
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.