Version 13 merge conflict resolution #135
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
Owner
asoral
commented
Jul 12, 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: gst_hsn_code is ambiguous on gst reports
(cherry picked from commit 3a00052)
fix: gst_hsn_code is ambiguous on gst reports (backport #36028)
## [13.52.2](v13.52.1...v13.52.2) (2023-07-08) ### Bug Fixes * gst_hsn_code is ambiguous on gst reports ([2893ae7](2893ae7))
…-13-hotfix/pr-35908 Revert "perf: improve item wise register reports (backport #35908)"
* refactor(Payment Entry): translatable strings (#36017) * refactor(Payment Entry): translatable strings * fix: German translations (cherry picked from commit af28f95) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.py # erpnext/translations/de.csv * chore: resolve conflicts --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix: payment entry `voucher_type` error (#35779) * fix: payment entry `voucher_type` error * chore: linters (cherry picked from commit 361a357) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.py * chore: resolve conflicts --------- Co-authored-by: Dany Robert <danyrt@wahni.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…ies (#35989) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit c16a581)
…-36088 fix: circular dependency during reposting causing timeout error (backport #36088)
chore: release v13
## [13.52.4](v13.52.3...v13.52.4) (2023-07-11) ### Bug Fixes * also check on_hold ([#35910](#35910)) ([5aa02b8](5aa02b8)) * circular dependency during reposting causing timeout error ([ba69be1](ba69be1)) * **Employee Advance:** check if return amount is set before validating ([#36080](#36080)) ([beaf13e](beaf13e)) * error messages while evaluating formulas and handle line boundaries ([#35989](#35989)) ([4af57a7](4af57a7)) * gst_hsn_code is ambiguous on gst reports ([3a00052](3a00052)) * incorrect status in MR created from PP (backport [#36085](#36085)) ([#36087](#36087)) ([e05bb10](e05bb10)) * payment entry `voucher_type` error ([#35779](#35779)) ([9c3ec41](9c3ec41)) * **Payment Entry:** compare rounded amount ([#36011](#36011)) ([b04c190](b04c190)) * precision causing outstanding issue on partly paid invoices ([#36030](#36030)) ([cf3ec93](cf3ec93)) * single column indexes ([#32425](#32425)) ([53f7764](53f7764)) ### Reverts * Revert "perf: improve item wise register reports (backport #35908) (#35912)" ([b992366](b992366)), closes [#35908](#35908) [#35912](#35912)
|
changes |
|
open |
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.