Version 13 #134
Merged
Version 13 #134
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
Jul 3, 2023
asoral
commented
(cherry picked from commit 517d8a0)
(cherry picked from commit 092c4b4)
…-35112 refactor(Gross Profit): simplify group by invoice logic (backport #35112)
(cherry picked from commit f7b2d10)
…-35530 fix: Task gantt popup style and info (backport #35530)
chore: release v13
…35615) * fix: calculate wdv depr schedule properly for existing assets * fix: calculate wdv depr schedule properly for existing assets properly
In an erpnext website, the /all-products route shows website items that have been published to the web site. In the list view (erpnext/e_commerce/product_ui/list.js), the css class is null for the product title. Instead, inline style statements have been added in that can not be modified by overriding CSS. This fix uses a similar approach to that which is taken in the grid view (erpnext/e_commerce/product_ui/grid.js). It removes the null CSS parameter in the product title link as well as the inline style statement. Then, as in the grid view, the product title is wrapped in a div tag with the product_title CSS class. This makes it possible to style the product title as desired with a CSS override.
…user about failures (#35507)
…ackport #31166) (#35674) * fix(accounts): validate payment entry references with latest data. (#31166) * test: payment entry over allocation. * fix: validate allocated_amount against latest outstanding amount. * fix: payment entry get outstanding documents for advance payments * fix: only fetch latest outstanding_amount. * fix: throw if reference is allocated * test: throw error if a reference has been partially allocated after inital creation. * chore: test name * fix: remove unused part of test * chore: linter * chore: more user friendly error messages * fix: only validate outstanding amount if partly paid and don't filter by cost center * chore: minor refactor for doc.cost_center Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 20de27d) # Conflicts: # erpnext/accounts/doctype/payment_entry/test_payment_entry.py * chore: resolve conflicts * chore: resolve more conflicts * chore: don't validate allocated amount in case of donation --------- Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
chore: release v13
## [13.51.2](v13.51.1...v13.51.2) (2023-06-14) ### Bug Fixes * **accounts:** validate payment entry references with latest data. (backport [#31166](#31166)) ([#35674](#35674)) ([4d4f218](4d4f218)) * Asset Depreciation Ledger Report - Add Total Row Checkbox Enabled ([3831c79](3831c79)) * calculate wdv depr schedule properly for existing assets [v13] ([#35615](#35615)) ([97f4af8](97f4af8)) * CSS not applied to product title (backport [#35582](#35582)) ([#35635](#35635)) ([1b69b37](1b69b37)) * don't set default payment amount in case of invoice return (backport [#35645](#35645)) ([#35648](#35648)) ([8e3636f](8e3636f)) * Lower deduction certificate not getting applied ([#35667](#35667)) ([c2bf8e3](c2bf8e3)) * make showing taxes as table in print configurable ([#35672](#35672)) ([4c2c037](4c2c037)) * Project in item-wise sales register ([#35596](#35596)) ([9d5b500](9d5b500)) * savepoint policy assignment submission, log errors & inform the user about failures ([#35507](#35507)) ([4a35ff0](4a35ff0)) ### Performance Improvements * refactor `get_all_nodes` in Org Chart ([986a90e](986a90e))
…e assets (backport #35714) (#35716) * fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (#35714) fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr. (cherry picked from commit bb39a2c) # Conflicts: # erpnext/assets/doctype/asset/depreciation.py * chore: fix conflict --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
fix: Incorrect field while calculating Tax withholding net total
(cherry picked from commit b95d459)
fix: Incorrect field while calculating Tax withholding net total (#35730)
## [13.51.3](v13.51.2...v13.51.3) (2023-06-16) ### Bug Fixes * Incorrect field while calculating Tax withholding net total ([f8a8cf3](f8a8cf3))
* fix: Allocated amount validation for other party types (#35741) * fix: Allocated amount validation for other party types * chore: Validation for return allocations * chore: minor typo --------- Co-authored-by: anandbaburajan <anandbaburajan@gmail.com> (cherry picked from commit 9d27a25) * chore: remove unnecessary donor party type check --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
* fix: Allocated amount validation for other party types (#35741) * fix: Allocated amount validation for other party types * chore: Validation for return allocations * chore: minor typo --------- Co-authored-by: anandbaburajan <anandbaburajan@gmail.com> (cherry picked from commit 9d27a25) * chore: remove unnecessary donor party type check --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> (cherry picked from commit 3d0add8)
(cherry picked from commit 8dcb930)
(cherry picked from commit 50822f2)
rename function remove return statement as the list is mutated (cherry picked from commit 1a3b9c5)
(cherry picked from commit cb9b4fb)
…-35320 fix: Gross and Net Profit Report - incorrect calculation of totals (backport #35320)
fix: Allocated amount validation for other party types (#35741)
## [13.51.5](v13.51.4...v13.51.5) (2023-06-19) ### Bug Fixes * Allocated amount validation for other party types ([#35741](#35741)) ([75b3423](75b3423))
…btn (backport #35776) (#35788) * fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776) * fix: fix get outstanding invoices btn and add get outstanding orders btn * chore: remove unnecessary arg (cherry picked from commit c1da3dd) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.json # erpnext/accounts/doctype/payment_entry/payment_entry.py * chore: resolving conflicts * chore: resolving conflicts properly --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
…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))
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.