Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: Payment Term must be mandatory if Allocate Payment based on .. is checked #35798

Merged
merged 1 commit into from
Jun 23, 2023
Merged

fix: Payment Term must be mandatory if Allocate Payment based on .. is checked #35798

merged 1 commit into from
Jun 23, 2023

Conversation

marination
Copy link
Collaborator

  • Make sure Payment Term is set if Allocate Payment Based On Payment Terms is enabled.
  • Payment Entry does not update linked Invoices' Payment Schedule if the Payment Term is missing in the Payment Schedule row
  • This beats the point of having the Allocate Payment Based On Payment Terms checkbox which is not respected
Screenshot 2023-06-20 at 11 26 41 AM

@marination
fix: Payment Term must be mandatory if Allocate Payment based on ..…
a73a9e1 
… is checked

- Front and Back end validation of condition
- Fix test to accomodate fix
@marination marination mentioned this pull request Jun 20, 2023
Merged
7 tasks
@codecov
Copy link

codecov bot commented Jun 20, 2023

Codecov Report

Merging #35798 (a73a9e1) into develop (4fbff20) will decrease coverage by 0.01%.
The diff coverage is 75.00%.

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop   #35798      +/-   ##
===========================================
- Coverage    64.12%   64.12%   -0.01%     
===========================================
  Files          810      810              
  Lines        61908    61910       +2     
===========================================
+ Hits         39700    39701       +1     
- Misses       22208    22209       +1
Impacted Files Coverage Δ
...e/payment_terms_template/payment_terms_template.py 95.65% <75.00%> (-4.35%) ⬇️

@deepeshgarg007 deepeshgarg007 merged commit 2868bae into frappe:develop Jun 23, 2023
11 of 13 checks passed
@deepeshgarg007 deepeshgarg007 added the backport version-14-hotfix backport to version 14 label Jun 23, 2023
mergify bot pushed a commit that referenced this pull request Jun 23, 2023
@marination @mergify
fix: Payment Term must be mandatory if Allocate Payment based on ..…
7181253 
… is checked (#35798)

- Front and Back end validation of condition
- Fix test to accomodate fix

(cherry picked from commit 2868bae)
@mergify mergify bot mentioned this pull request Jun 23, 2023
Merged
deepeshgarg007 pushed a commit that referenced this pull request Jun 24, 2023
@mergify @marination
fix: Payment Term must be mandatory if Allocate Payment based on ..…
3dd3935 
… is checked (#35798)

fix: Payment Term must be mandatory if `Allocate Payment based on ..` is checked (#35798)

- Front and Back end validation of condition
- Fix test to accomodate fix

(cherry picked from commit 2868bae)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jun 28, 2023
@frappe-bot
chore(release): Bumped to Version 14.28.0
29ea5cf 
# [14.28.0](v14.27.14...v14.28.0) (2023-06-28)

### Bug Fixes

* asset capitalization ([#35832](#35832)) ([fb823b5](fb823b5))
* asset movement ([#35918](#35918)) ([e16c148](e16c148))
* delivery trip driver is only required on submit (backport [#35876](#35876)) ([#35893](#35893)) ([fc051d1](fc051d1))
* don't allow to make reposting entry for closing stock balance period ([e68b088](e68b088))
* filter parent warehouses not showing (backport [#35897](#35897)) ([#35899](#35899)) ([87ba196](87ba196))
* incorrect cost center error in bank reconciliation ([cacb0f6](cacb0f6))
* issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport [#35821](#35821)) ([#35827](#35827)) ([20f2bef](20f2bef))
* make credit note and debit note exclusive ([#35781](#35781)) ([fafb46e](fafb46e))
* multiple Work Orders agaist same production plan ([8ddfc34](8ddfc34))
* no permission for accounts settings on payment reconciliation ([200ddbf](200ddbf))
* Payment Term must be mandatory if `Allocate Payment based on ..` is checked ([#35798](#35798)) ([3dd3935](3dd3935))
* POS Closing Entry load all invoices with one request on save ([#35819](#35819)) ([8ecca2a](8ecca2a))
* reconcile invoice against credit note. ([#35604](#35604)) ([5c388a1](5c388a1))
* Remove special treatment for P&L Accounts ([#35602](#35602)) ([b023448](b023448))
* Set Asset cost center default as PR or PI Item Cost Center while auto creating ([#35844](#35844)) ([4a7d75b](4a7d75b))
* show non-depreciable assets in fixed asset register ([#35858](#35858)) ([42d0944](42d0944))
* TDS amount calculation post LDC breach ([851b887](851b887))
* use correct fieldname for purchase receipt column in item_wise_purchase_register report ([#35828](#35828)) ([8f13b48](8f13b48))
* **ux:** PO Get Items From Open Material Requests (backport [#35894](#35894)) ([#35895](#35895)) ([2ef2057](2ef2057))

### Features

* Auto set Party in Bank Transaction ([#34675](#34675)) ([d53b197](d53b197))
* Provision to send Accounts Receivable Reports using Process SOA ([#35789](#35789)) ([21d560c](21d560c)), closes [#35707](#35707)

### Performance Improvements

* improve item wise register reports ([#35908](#35908)) ([33ee011](33ee011))
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r s-aga-r is a code owner

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees

@deepeshgarg007 deepeshgarg007

Labels
backport version-14-hotfix backport to version 14
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@marination @deepeshgarg007