Version 13 #128
Open
Version 13 #128
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
Apr 27, 2023
asoral
commented
…fix/pr-34679 fix: enclose ternary operator in parenthesis (backport frappe#34679)
(cherry picked from commit a4112c7)
…fix/pr-34656 fix: BOM Update Cost, when no actual qty (backport frappe#34656)
(cherry picked from commit d560703)
…fix/pr-34715 fix: bom update log not working for large batch size (backport frappe#34715)
…pe#34545) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
fix: monthly wdv and dd schedule
…rappe#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 (frappe#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>
fix: Shop by category fixes (frappe#34688) * fix: Shop by category fixes * chore: Update tests (cherry picked from commit 56f5078) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…e#34712)" Revert "fix: `payment entry is already created` on posawesome. (backport frappe#34712) (frappe#34753)" This reverts commit b48fca3.
…ort frappe#34712)" (backport frappe#34756) (frappe#34757) Revert "fix: `payment entry is already created` on posawesome. (frappe#34712)" Revert "fix: `payment entry is already created` on posawesome. (backport frappe#34712) (frappe#34753)" This reverts commit b48fca3. (cherry picked from commit 034e35e) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
## [13.49.11](frappe/erpnext@v13.49.10...v13.49.11) (2023-04-05) ### Reverts * Revert "fix: `payment entry is already created` on posawesome. (backport frappe#34712)" (backport frappe#34756) (frappe#34757) ([98de1f2](frappe@98de1f2)), closes [frappe#34712](frappe#34712) [frappe#34756](frappe#34756) [frappe#34757](frappe#34757) [frappe#34712](frappe#34712) [frappe#34712](frappe#34712) [frappe#34753](frappe#34753)
(cherry picked from commit b70615e)
…fix/pr-34735 'Make Asset Movement' button translation fix in asset_list.js (backport frappe#34735)
fix: Item tax validity comparison fixes (frappe#34784) fix: Item tax validity comparsion fixes (cherry picked from commit 6f6928f) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…appe#34803) fix: provide filter by depreciable assets in fixed asset register (frappe#34803) (cherry picked from commit c957a5c) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
revert: remove frappe.send_message (v14) (frappe#34816) revert: remove frappe.send_message (cherry picked from commit 8a331e0) Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
chore: release v13
## [13.49.12](frappe/erpnext@v13.49.11...v13.49.12) (2023-04-11) ### Bug Fixes * `payment entry is already created` on posawesome. (backport [frappe#34712](frappe#34712)) ([frappe#34753](frappe#34753)) ([b48fca3](frappe@b48fca3)) * Allocate tax loss to tax account head on early payment discount ([frappe#34287](frappe#34287)) ([92a26dd](frappe@92a26dd)) * asset monthly WDV and DD schedule [v13] ([frappe#34645](frappe#34645)) ([fed43ae](frappe@fed43ae)) * BOM Update Cost, when no actual qty ([9725698](frappe@9725698)) * bom update log not working for large batch size ([9cf30d7](frappe@9cf30d7)) * don't include cancelled JVs in assdeprledger report ([frappe#34737](frappe#34737)) ([3007ac3](frappe@3007ac3)) * enclose ternary operator in parentheses ([198830a](frappe@198830a)) * filter out old allocation's cf leaves while fetching leave details ([frappe#34723](frappe#34723)) ([50de045](frappe@50de045)) * format currency/float as per number format in work history ([frappe#34545](frappe#34545)) ([892c480](frappe@892c480)) * incorrect arg name in asset value adjustment ([545807a](frappe@545807a)) * incorrect balance qty in the stock ledger report ([dab1f1a](frappe@dab1f1a)) * Item tax validity comparison fixes ([frappe#34784](frappe#34784)) ([71bafab](frappe@71bafab)) * lost opportunity report issue ([frappe#34626](frappe#34626)) ([ab06cb4](frappe@ab06cb4)) * posting time issue ([f22e777](frappe@f22e777)) * provide filter by depreciable assets in fixed asset register ([frappe#34803](frappe#34803)) ([8609bf4](frappe@8609bf4)) * serial no with zero quantity issue in stock reco ([46638b1](frappe@46638b1)) * Shop by category fixes (backport [frappe#34688](frappe#34688)) ([frappe#34751](frappe#34751)) ([af828e4](frappe@af828e4)) ### Reverts * Revert "fix: `payment entry is already created` on posawesome. (frappe#34712)" ([034e35e](frappe@034e35e)), closes [frappe#34712](frappe#34712) [frappe#34712](frappe#34712) [frappe#34753](frappe#34753) * remove frappe.send_message (v13) ([frappe#34820](frappe#34820)) ([77f1322](frappe@77f1322)), closes [frappe#34816](frappe#34816)
* chore: update CODEOWNERS [skip ci] (cherry picked from commit aa8b241) # Conflicts: # CODEOWNERS * fix: conflicts * chore: remove duplicates * chore: remove duplicates --------- Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
(cherry picked from commit fb3271c) # Conflicts: # erpnext/stock/doctype/serial_no/serial_no.json
fix: change discuss forum url (frappe#34891) [skip ci] (cherry picked from commit dd93ea0) Co-authored-by: MohsinAli <mmatiyailol@gmail.com>
…fix/pr-34858 fix: unable to change `company` for manual `Serial No` entry (backport frappe#34858)
fix(Payment Entry): compare rounded amount (frappe#36011) (cherry picked from commit 4badac8) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> (cherry picked from commit b04c190)
fix(Payment Entry): compare rounded amount (frappe#36011)
## [13.52.1](frappe/erpnext@v13.52.0...v13.52.1) (2023-07-05) ### Bug Fixes * **Payment Entry:** compare rounded amount ([frappe#36011](frappe#36011)) ([a7d26b0](frappe@a7d26b0)) * **Payment Entry:** compare rounded amount ([frappe#36011](frappe#36011)) ([a370dc3](frappe@a370dc3))
…sn_code fix: gst_hsn_code is ambiguous on gst reports
(cherry picked from commit 3a00052)
…36028 fix: gst_hsn_code is ambiguous on gst reports (backport frappe#36028)
## [13.52.2](frappe/erpnext@v13.52.1...v13.52.2) (2023-07-08) ### Bug Fixes * gst_hsn_code is ambiguous on gst reports ([2893ae7](frappe@2893ae7))
…) (frappe#35912)" This reverts commit 4134459.
…ersion-13-hotfix/pr-35908 Revert "perf: improve item wise register reports (backport frappe#35908)"
…) (frappe#35912)" This reverts commit 4134459. (cherry picked from commit b992366)
…36034 Revert "perf: improve item wise register reports (backport frappe#35908)" (backport frappe#36034)
## [13.52.3](frappe/erpnext@v13.52.2...v13.52.3) (2023-07-09) ### Reverts * Revert "perf: improve item wise register reports (backport frappe#35908) (frappe#35912)" ([0feb393](frappe@0feb393)), closes [frappe#35908](frappe#35908) [frappe#35912](frappe#35912)
…) (frappe#36056) chore: add asset depr posting error in error log (frappe#36052) (cherry picked from commit 0f9a6ee) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
…ppe#36030) fix: precision causing outstanding issue on partly paid invoices (frappe#36030) * fix: precision causing outstanding issue on partly paid invoices * chore: linters (cherry picked from commit 5c820ec) Co-authored-by: Dany Robert <danyrt@wahni.com>
fix: single column indexes (frappe#32425) refactor: move single column indexes to doctypes (cherry picked from commit 8d1db0e) Co-authored-by: Ankush Menat <ankush@frappe.io>
* refactor(Payment Entry): translatable strings (frappe#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 (frappe#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>
…rappe#36087) fix: incorrect status in MR created from PP (frappe#36085) (cherry picked from commit be58812) Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
…ies (frappe#35989) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit c16a581)
…fix/pr-36088 fix: circular dependency during reposting causing timeout error (backport frappe#36088)
chore: release v13
## [13.52.4](frappe/erpnext@v13.52.3...v13.52.4) (2023-07-11) ### Bug Fixes * also check on_hold ([frappe#35910](frappe#35910)) ([5aa02b8](frappe@5aa02b8)) * circular dependency during reposting causing timeout error ([ba69be1](frappe@ba69be1)) * **Employee Advance:** check if return amount is set before validating ([frappe#36080](frappe#36080)) ([beaf13e](frappe@beaf13e)) * error messages while evaluating formulas and handle line boundaries ([frappe#35989](frappe#35989)) ([4af57a7](frappe@4af57a7)) * gst_hsn_code is ambiguous on gst reports ([3a00052](frappe@3a00052)) * incorrect status in MR created from PP (backport [frappe#36085](frappe#36085)) ([frappe#36087](frappe#36087)) ([e05bb10](frappe@e05bb10)) * payment entry `voucher_type` error ([frappe#35779](frappe#35779)) ([9c3ec41](frappe@9c3ec41)) * **Payment Entry:** compare rounded amount ([frappe#36011](frappe#36011)) ([b04c190](frappe@b04c190)) * precision causing outstanding issue on partly paid invoices ([frappe#36030](frappe#36030)) ([cf3ec93](frappe@cf3ec93)) * single column indexes ([frappe#32425](frappe#32425)) ([53f7764](frappe@53f7764)) ### Reverts * Revert "perf: improve item wise register reports (backport frappe#35908) (frappe#35912)" ([b992366](frappe@b992366)), closes [frappe#35908](frappe#35908) [frappe#35912](frappe#35912)
asoral
force-pushed
the
version-13
branch
2 times, most recently
from
6e4c2f5
to
12e27e9
Compare
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.