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 #121
Open
asoral
wants to merge
10,000
commits into
asoral:version-13-grandhyper
Choose a base branch
from
frappe:version-13
base: version-13-grandhyper
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Version 13 #121
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
Oct 25, 2022
…5751) (#35800) * fix: date and finance book fixes in fixed asset register (#35751) * fix: handle finance books properly and show all assets by default in fixed asset register * chore: rename value to depr amount * chore: get asset value for correct fb properly * chore: rename include_default_book_entries to include_default_book_assets (cherry picked from commit 0d12588) # Conflicts: # erpnext/assets/report/fixed_asset_register/fixed_asset_register.py * chore: resolving conflicts and renaming entries to assets * chore: formatting --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
chore: release v13
## [13.51.6](v13.51.5...v13.51.6) (2023-06-21) ### Bug Fixes * account group totals calculation to consider include_in_gross ([f22969d](f22969d)) * add total col for gross and net profit ([e899c30](e899c30)) * add validation for QI in PR (backport [#35677](#35677)) ([#35758](#35758)) ([0a8b714](0a8b714)) * Allocated amount validation for other party types ([#35741](#35741)) ([3d0add8](3d0add8)) * date and finance book fixes in fixed asset register (backport [#35751](#35751)) ([#35800](#35800)) ([aa8446d](aa8446d)) * don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport [#35714](#35714)) ([#35716](#35716)) ([0e11317](0e11317)) * fix get outstanding invoices btn and add get outstanding orders btn (backport [#35776](#35776)) ([#35788](#35788)) ([04990d5](04990d5)) * Incorrect field while calculating Tax withholding net total ([571c977](571c977)) * Incorrect field while calculating Tax withholding net total ([b95d459](b95d459)) * loan interest accrual date ([#35695](#35695)) ([46d0b7d](46d0b7d)) ### Performance Improvements * index `purpose` in `Stock Entry` (backport [#35782](#35782)) ([#35784](#35784)) ([7239e83](7239e83))
…wice if workflow is enabled in Journal Entry (#35821) * Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry * chore: remove unnecessary line break * chore: formatting --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
* chore: asset scrap and restore fixes [v14] (#35851) chore: better err msg on cancelling JE for asset scrap and allow restoring non-depr assets (cherry picked from commit 69780da) # Conflicts: # erpnext/assets/doctype/asset/depreciation.py * chore: fix conflict --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
* fix: TDS amount calculation post LDC breach (cherry picked from commit 1f9ef6c) # Conflicts: # erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
chore: release v13
## [13.51.7](v13.51.6...v13.51.7) (2023-06-28) ### Bug Fixes * asset movement (backport [#35918](#35918)) ([#35924](#35924)) ([0bcd047](0bcd047)) * employee link fields in payroll reports ([#619](#619)) ([#35845](#35845)) ([6c4dff3](6c4dff3)) * filter parent warehouses not showing (backport [#35897](#35897)) ([#35900](#35900)) ([bcfd770](bcfd770)) * frappe.exceptions.DoesNotExistError: DocType KSA VAT Setting ([#35797](#35797)) ([3785fe6](3785fe6)), closes [#35795](#35795) * show non-depreciable assets in fixed asset register (backport [#35858](#35858)) ([#35861](#35861)) ([2e2c319](2e2c319)) * TDS amount calculation post LDC breach ([#35886](#35886)) ([4dd088c](4dd088c)) * use correct fieldname for purchase receipt column in item_wise_purchase_register report (backport [#35828](#35828)) ([#35848](#35848)) ([de529f0](de529f0)) * **ux:** PO Get Items From Open Material Requests (backport [#35894](#35894)) ([#35896](#35896)) ([12b6257](12b6257)) ### Performance Improvements * improve item wise register reports (backport [#35908](#35908)) ([#35912](#35912)) ([4134459](4134459))
chore: update translations chore: update translations (cherry picked from commit 1d1103f) Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
* fix: add missing german translations * feat(DATEV): against account for opening entries Allow to specify a separate temporary against account for opening entries * feat(DATEV Settings): validate account no. length * style: format with black * style: format with black * test: new settings field, rename filter
(cherry picked from commit c0c693d) # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
…-35955 fix: incorrect reposting causing stock adjustment entry (backport #35955)
* fix: Update no copy for received_qty field (#35965) (cherry picked from commit 5448859) # Conflicts: # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json * chore: resolve conflicts * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
chore: release v13
# [13.52.0](v13.51.7...v13.52.0) (2023-07-05) ### Bug Fixes * conflicts ([b9833db](b9833db)) * Expense Account filter in Sales Invoice ([#35944](#35944)) ([b63fbe4](b63fbe4)) * Further sort purchase_order_analysis to get consistent response ([0ef0ff4](0ef0ff4)) * reposting has not changed valuation rate ([d4e680c](d4e680c)) * Update no copy for received_qty field ([#35965](#35965)) ([10c9640](10c9640)) ### Features * **DATEV:** against account for opening entries ([#35941](#35941)) ([0602ddc](0602ddc))
* ci: pin semgrep to old version current version has problem with PRs originating from fork * ci: unpin semgrep --------- Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
fix: make create button translatable (#38165) * fix: make all create buttons translatable * style: use double quotes --------- Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> (cherry picked from commit 8e4b591) Co-authored-by: Patrick Eissler <77415730+PatrickDEissler@users.noreply.github.com>
chore: release v13
# [13.55.0](v13.54.14...v13.55.0) (2023-12-05) ### Bug Fixes * consider the `Valuation Method` while picking incorrect SLE (backport [#38592](#38592)) ([#38596](#38596)) ([1b78dd1](1b78dd1)) * make create button translatable (backport [#38165](#38165)) ([#38412](#38412)) ([bd371e6](bd371e6)) * show difference amount in default currency ([6f44a16](6f44a16)) * update voucher currency for allocated entry ([3dfc145](3dfc145)) ### Features * `Company` filter in `Stock Ledger Variance` report (backport [#38553](#38553)) ([#38575](#38575)) ([77e01eb](77e01eb)) * add currency column for allocated entries ([835c85a](835c85a))
(cherry picked from commit 137b5a6)
(cherry picked from commit 2721ee3)
(cherry picked from commit 65df4b6)
(cherry picked from commit 7babfd4)
(cherry picked from commit 40c1acc)
(cherry picked from commit 956c3c5)
Manual partial backport of #36649
not available in v13
…-38672 fix: get data for leaderboard (backport #38672)
fix: earned leave exceeding annual allocation
chore: release v13
## [13.55.1](v13.55.0...v13.55.1) (2023-12-20) ### Bug Fixes * avoid over allocation during backdated assignment creation ([fee4eae](fee4eae)) * earned leave allocation in policy assignment ([14955c7](14955c7)) * earned leave exceeding annual allocation ([ee7c9ad](ee7c9ad)) * get customers for leaderboard ([10f02e6](10f02e6)) * get items for leaderboard ([3863c4e](3863c4e)) * get sales partner for leaderboard ([b0f7de1](b0f7de1)) * get sales person for leaderboard ([8dbb200](8dbb200)) * get suppliers for leaderboard ([7df8425](7df8425))
fix(Payment Entry): don't check empty references
chore: Loan Interest Accrual post topup
(cherry picked from commit 9a00edb)
…-38891 fix: incorrect price list in customer-wise item price report (backport #38891)
chore: release v13
## [13.55.2](v13.55.1...v13.55.2) (2023-12-27) ### Bug Fixes * incorrect price list in customer-wise item price report ([32f3365](32f3365)) * **Payment Entry:** don't check empty references ([f0877ff](f0877ff))
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.