-
Notifications
You must be signed in to change notification settings - Fork 7.4k
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
fix: payment allocation in invoice payment schedule #36440
Merged
ruthra-kumar
merged 4 commits into
frappe:develop
from
GursheenK:payment-allocation-for-PI/SI-schedule
Aug 4, 2023
Merged
fix: payment allocation in invoice payment schedule #36440
ruthra-kumar
merged 4 commits into
frappe:develop
from
GursheenK:payment-allocation-for-PI/SI-schedule
Aug 4, 2023
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
GursheenK
requested review from
deepeshgarg007 and
rohitwaghchaure
as code owners
August 1, 2023 09:20
github-actions
bot
added
accounts
needs-tests
This PR needs automated unit-tests.
labels
Aug 1, 2023
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #36440 +/- ##
===========================================
+ Coverage 64.52% 64.54% +0.02%
===========================================
Files 786 787 +1
Lines 61123 61172 +49
===========================================
+ Hits 39440 39485 +45
- Misses 21683 21687 +4
|
ruthra-kumar
approved these changes
Aug 4, 2023
ruthra-kumar
added
backport version-14-hotfix
backport to version 14
and removed
needs-tests
This PR needs automated unit-tests.
labels
Aug 4, 2023
mergify bot
pushed a commit
that referenced
this pull request
Aug 4, 2023
* fix: payment allocation in invoice payment schedule * test: payment allocation for payment terms * chore: linting issues (cherry picked from commit edbefee) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
deepeshgarg007
added a commit
that referenced
this pull request
Aug 8, 2023
* fix: payment allocation in invoice payment schedule (#36440) * fix: payment allocation in invoice payment schedule * test: payment allocation for payment terms * chore: linting issues (cherry picked from commit edbefee) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py * chore: resolve conflicts --------- Co-authored-by: Gursheen Kaur Anand <[email protected]> Co-authored-by: Deepesh Garg <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Aug 9, 2023
# [14.34.0](v14.33.2...v14.34.0) (2023-08-09) ### Bug Fixes * **accounts:** Translate columns in AP/AR report ([#36503](#36503)) ([6739369](6739369)) * AP and AR summary ([769d7d7](769d7d7)) * check root type only when not none ([46bb309](46bb309)) * cross connect delivery note and sales invoice ([#36183](#36183)) ([8501a11](8501a11)) * Debit credit difference while submitting Sales Invoice ([#36523](#36523)) ([240d866](240d866)) * don't allow negative rate (backport [#36027](#36027)) ([#36465](#36465)) ([caa4f33](caa4f33)) * enqueue submit/cancel action for stock entry having more than 50 line items (backport [#36532](#36532)) ([#36536](#36536)) ([9c108a8](9c108a8)) * fetch ple for all party types ([674dba8](674dba8)) * fetch ple with party type employee in AP ([1ca9aca](1ca9aca)) * Fix query for financial statement report ([d1590f2](d1590f2)) * get incoming rate instead of BOM rate (backport [#36496](#36496)) ([#36506](#36506)) ([bdfbccd](bdfbccd)) * handle None value in payment_term_outstanding ([b033b3b](b033b3b)) * Lower deduction certificate for multi-company ([#36491](#36491)) ([2216875](2216875)) * payment allocation in invoice payment schedule ([#36440](#36440)) ([0e87c86](0e87c86)) * search not working for so in the Production Plan ([#36459](#36459)) ([8c57d56](8c57d56)) * serial no not able to reject for the internal transfer ([#36467](#36467)) ([c1819a4](c1819a4)) * stock entry decimal issue (backport [#36530](#36530)) ([#36533](#36533)) ([5b04708](5b04708)) * stock reconciliation negative stock error (backport [#36544](#36544)) ([#36549](#36549)) ([00b9df0](00b9df0)) * Tax withholding against order via Payment Entry ([#36493](#36493)) ([a234b89](a234b89)) * use correct lang separator for frappe (backport [#36519](#36519)) ([#36520](#36520)) ([f9981d1](f9981d1)) * **ux:** add `Ordered Qty` column in Get Items From > MR (backport [#36486](#36486)) ([#36505](#36505)) ([0d7a4b6](0d7a4b6)) ### Features * ledger comparison report ([#36485](#36485)) ([07f235c](07f235c)) * **RFQ:** make sending attachments configurable (backport [#36359](#36359)) ([#36535](#36535)) ([5881960](5881960)) ### Performance Improvements * asset depreciation entry posting ([#36461](#36461)) ([cd1c175](cd1c175)) * defer holiday list imports ([7adad42](7adad42))
mergify bot
added a commit
that referenced
this pull request
Aug 11, 2023
* fix: payment allocation in invoice payment schedule (#36440) * fix: payment allocation in invoice payment schedule * test: payment allocation for payment terms * chore: linting issues (cherry picked from commit edbefee) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py * chore: resolve conflicts --------- Co-authored-by: Gursheen Kaur Anand <[email protected]> Co-authored-by: Deepesh Garg <[email protected]> (cherry picked from commit 0e87c86) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
deepeshgarg007
pushed a commit
that referenced
this pull request
Aug 13, 2023
fix: payment allocation in invoice payment schedule (#36440)
frappe-pr-bot
pushed a commit
that referenced
this pull request
Aug 16, 2023
## [13.52.10](v13.52.9...v13.52.10) (2023-08-16) ### Bug Fixes * Allow backdated repayment cancels for term loans ([c417365](c417365)) * payment allocation in invoice payment schedule ([#36440](#36440)) ([e5b3860](e5b3860)) ### Performance Improvements * **invoice:** Faster return amount query (backport [#36556](#36556)) ([#36558](#36558)) ([a801bba](a801bba))
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.
Added a check to ensure Allocate Payment Based On Payment Terms is enabled for allocating the amount to the different payment terms in the payment schedule.