fix: close employee loan on write off #37638
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
anandbaburajan
changed the title
deepeshgarg007
merged commit 922ace4
into
frappe:version-14-hotfix
10 of 12 checks passed
rohitwaghchaure
added a commit
that referenced
this pull request
Oct 25, 2023
* fix(delivery): rename dt fetch stop action (backport #37605) (#37606) fix(delivery): rename dt fetch stop action (cherry picked from commit 79d51a0) Co-authored-by: David Arnold <dgx.arnold@gmail.com> * fix: incorrect cost center in the purchase invoice (backport #37591) (#37609) * fix: incorrect cost center in the purchase invoice (#37591) (cherry picked from commit 14b009b) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * fix(minor): filter bank accounts in bank statement import (#37525) fix(minor): filter bank accounts in bank statement import (#37525) fix: filter by company in bank account (cherry picked from commit 9d39297) Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com> * fix: set empty value for tax template in item details (#37496) * fix: set empty value for tax template in item details (#37496) * fix: empty tax template for items with invalid templates * fix: test for empty tax template * fix: test for item tax template calculation * fix: test for pos inv tax template calculation (cherry picked from commit b0d440c) # Conflicts: # erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py * chore: resolve conflicts --------- Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com> * fix(minor): filter tax template based on company in subscription (#37562) fix: filter tax template based on company (cherry picked from commit 1a2f659) Co-authored-by: Gursheen Anand <gursheen@frappe.io> * fix: Cash flow mapping fix (#37522) Cash flow mapping fix * fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37628) fix: remove from or target warehouse for non internal transfer entries (#37612) (cherry picked from commit 5136fe1) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * Revert "fix: set empty value for tax template in item details (#37496)" Revert "fix: set empty value for tax template in item details (#37496)" This reverts commit ec208b8. * refactor: gain_loss posting date fields in the allocation table (cherry picked from commit 55dbcee) * refactor: introduce fields in popup (cherry picked from commit 5323bb7) * refactor: pass gain loss posting date to controller (cherry picked from commit 7e600a6) * test: varying posting date for gain loss journal (cherry picked from commit 514d543) * fix: overallocation on Payment with PO/SO (cherry picked from commit 23df420) # Conflicts: # erpnext/accounts/utils.py * test: overalloction on reconciliation when PO is involved (cherry picked from commit 946228d) * refactor(test): make use of utility methods (cherry picked from commit 547993f) * chore: fix flakiness `test_sales_order_partial_advance_payment` (cherry picked from commit 4dff2c7) * chore: resolve conflict * fix: close employee loan on write off (#37638) * fix: exclude written off amount while calculating loan repayment * fix: revert exclude written off amount while calculating loan repayment * fix: close employee loan on write off * refactor: button on PE to filter associated Journals (cherry picked from commit 150728d) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.js * chore: resolve conflict * fix: incorrect process loss validation for multiple finished items (backport #37576) (#37656) fix: incorrect process loss validation for multiple finished items (#37576) (cherry picked from commit 92cbe58) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> * chore: fixed test cases related to Internal Transfer (#37659) * fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#37660) * fix: GL Entries for receiving non CWIP assets using Purchase Receipt * fix: rearrange functions * chore: rearrange functions * chore: rearrange functions * fix: Purchase Invoice GL entires for assets * test: cwip accounting unit tests * chore: Attribute error * chore: Purchase Invoice tests * chore: Missing asset account * chore: Missing asset account * chore: update tests * fix: Internal transfer GL Entries * test: Deprecate tests * test: Depricate tests * test: Depricate tests * chore: make `Reserve Stock` checkbox visible in SO * refactor: rename field `Auto Reserve Stock for Sales Order` * feat: add fields to hold SO and SO Item ref in PR Item * test: Deprecate tests * test: Depricate tests * test: Depricate tests * refactor: Remove expense included in valuation accounts * chore: Add back default in transit warehousefield --------- Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com> * fix: wrong german translation (#37658) --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: David Arnold <dgx.arnold@gmail.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com> Co-authored-by: Gursheen Anand <gursheen@frappe.io> Co-authored-by: saeedkola <mohammedsaeedk@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: ruthra kumar <ruthra@erpnext.com> Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 31, 2023
# [14.46.0](v14.45.4...v14.46.0) (2023-10-31) ### Bug Fixes * add regional support to extend purchase gl entries ([d02ebd6](d02ebd6)) * avoid name clash in delivery stop (backport [#37306](#37306)) ([#37701](#37701)) ([556095d](556095d)) * Cash flow mapping fix ([#37522](#37522)) ([8e31379](8e31379)) * close employee loan on write off ([#37638](#37638)) ([922ace4](922ace4)) * **defaults:** apply discount and provisonal defaults from item group and brand if available (backport [#37466](#37466)) ([#37703](#37703)) ([a0893dd](a0893dd)) * **delivery:** rename dt fetch stop action (backport [#37605](#37605)) ([#37606](#37606)) ([8660faa](8660faa)) * GL Entries for receiving non CWIP assets using Purchase Receipt ([#37660](#37660)) ([80774e2](80774e2)) * incorrect cost center in the purchase invoice (backport [#37591](#37591)) ([#37609](#37609)) ([50daf70](50daf70)) * incorrect material request quantity in production plan ([#37785](#37785)) ([25718d9](25718d9)) * incorrect process loss validation for multiple finished items (backport [#37576](#37576)) ([#37656](#37656)) ([638c271](638c271)) * indexing on Delivery Note Item (backport [#37766](#37766)) ([#37777](#37777)) ([9b66a06](9b66a06)) * make changes that enable gantt view for job cards (backport [#37661](#37661)) ([#37756](#37756)) ([712ddb7](712ddb7)) * **minor:** filter bank accounts in bank statement import ([#37525](#37525)) ([1cb9f4c](1cb9f4c)) * **minor:** filter tax template based on company in subscription ([#37562](#37562)) ([c05e0a4](c05e0a4)) * **minor:** set tax values for item variants (backport [#37674](#37674)) ([#37738](#37738)) ([fabcfc1](fabcfc1)) * negative current qty causing recursion issue ([#37752](#37752)) ([f1407bc](f1407bc)) * overallocation on Payment with PO/SO ([d71b885](d71b885)) * purchase receipt with stock and asset items ([375be8c](375be8c)) * remove from or target warehouse for non internal transfer entries (backport [#37612](#37612)) ([#37628](#37628)) ([78b7c26](78b7c26)) * set correct `purchase_sle` in `get_last_sle()` ([#37708](#37708)) ([86cf156](86cf156)) * set empty value for tax template in item details ([#37496](#37496)) ([ec208b8](ec208b8)) * typeerror on tds payable monthly report ([fea27d5](fea27d5)) * update existing doc if possible ([89f07dc](89f07dc)) * wrong german translation ([#37658](#37658)) ([fa5780c](fa5780c)) ### Features * allow return of components for SCO that don't have SCR created (backport [#37686](#37686)) ([#37692](#37692)) ([e96d5b3](e96d5b3)) * **delivery:** link to delivery notes list view from delivery trip (backport [#37604](#37604)) ([#37695](#37695)) ([c58fefb](c58fefb)) ### Reverts * Revert "fix: set empty value for tax template in item details (#37496)" ([ca13816](ca13816)), closes [#37496](#37496) [#37496](#37496)
|
🎉 This PR is included in version 14.46.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
A user did a write off for a loan but when he runs the payroll through Frappe HR, the system still fetches the loan which had been written off. The reason was that the loan wasn't closed after write off. Now, the loan would be closed after a write off if there's no pending principal amount.