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.

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: allow over-payment against SO #35079

Merged
merged 1 commit into from
May 14, 2023

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Apr 27, 2023

If overbilling is allowed via Accounts Settings, users should be able to record advance payments against SO up to that amount.

Backend validation handled in #34969

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Apr 27, 2023
@barredterra barredterra added backport version-13-hotfix backport version-14-hotfix backport to version 14 and removed needs-tests This PR needs automated unit-tests. labels Apr 27, 2023
@codecov
Copy link

codecov bot commented Apr 27, 2023

Codecov Report

Merging #35079 (0de3656) into develop (01bfd2a) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #35079      +/-   ##
===========================================
- Coverage    63.69%   63.69%   -0.01%     
===========================================
  Files          813      813              
  Lines        60019    60020       +1     
===========================================
  Hits         38228    38228              
- Misses       21791    21792       +1     
Impacted Files Coverage Δ
erpnext/startup/boot.py 0.00% <0.00%> (ø)

@stale
Copy link

stale bot commented May 12, 2023

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label May 12, 2023
@deepeshgarg007 deepeshgarg007 merged commit 870b02b into frappe:develop May 14, 2023
16 checks passed
mergify bot pushed a commit that referenced this pull request May 14, 2023
mergify bot pushed a commit that referenced this pull request May 14, 2023
deepeshgarg007 pushed a commit that referenced this pull request May 14, 2023
fix: allow over-payment against SO (#35079)

(cherry picked from commit 870b02b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
@barredterra barredterra deleted the allow-excess-payments branch May 14, 2023 06:53
frappe-pr-bot pushed a commit that referenced this pull request May 16, 2023
## [14.24.2](v14.24.1...v14.24.2) (2023-05-16)

### Bug Fixes

* add missing options for `Content Align` ([3697e8f](3697e8f))
* allow over-payment against SO ([#35079](#35079)) ([fe9e0c2](fe9e0c2))
* bad strings format for command get-untraslated  ([#34361](#34361)) ([5a54296](5a54296))
* bad strings format for update-translations ([#34592](#34592)) ([e3c1d73](e3c1d73))
* bom item filter issue ([098603d](098603d))
* cancelled vouchers in tax withheld vouchers list ([#35309](#35309)) ([c41e1d7](c41e1d7))
* enqueue submit/cancel action for stock entry to avoid time out error ([457846e](457846e))
* force to do reposting for cancelled document ([6f96e5d](6f96e5d))
* function `batch_no` should only be declared once ([#35115](#35115)) ([26928b3](26928b3))
* incorrect packing items ([ab56470](ab56470))
* inventory dimension for inter company transfer return use case ([6d121b8](6d121b8))
* inventory dimension for material transfer not working ([1d8050d](1d8050d))
* item list view not working ([d9efa66](d9efa66))
* port option for additional_conditions in item wise sales register ([#35187](#35187)) ([42037f9](42037f9))
* recalculate costs in SCR while reposting ([9a8ee62](9a8ee62))
* sales person allocated amount calculation error nonetype and float ([#35293](#35293)) ([3a7c69f](3a7c69f))
* test case ([3f8928b](3f8928b))
* test case ([9b2b467](9b2b467))
* typo ([2772a91](2772a91))
* unable to create partial invoice with auto fetch terms enabled ([#35285](#35285)) ([fa9fa97](fa9fa97))
* update workstation hour rate when workstation change in job card ([bc88415](bc88415))
* **UX:** misc "home" onboarding improvements (backport [#35319](#35319)) ([#35321](#35321)) ([f8c58b6](f8c58b6))
* validate for active sla ([#32132](#32132)) ([38e27a6](38e27a6))

### Performance Improvements

* cache and simplify queries for holiday list (backport [#35315](#35315)) ([#35318](#35318)) ([0e78403](0e78403))
deepeshgarg007 added a commit that referenced this pull request May 20, 2023
fix: allow over-payment against SO (#35079)

(cherry picked from commit 870b02b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request May 24, 2023
## [13.50.6](v13.50.5...v13.50.6) (2023-05-24)

### Bug Fixes

* allow over-payment against SO ([#35079](#35079)) ([eb243c2](eb243c2))
* bypass flag in Customer Group wasn't effective ([f0c9d89](f0c9d89))
* change field-type to remove currency field from total row in export ([f65be40](f65be40))
* consider 0 if rate/qty are null (backport [#35338](#35338)) ([#35341](#35341)) ([387f8b9](387f8b9))
* depreciation schedule for existing assets [v14] (backport [#35255](#35255)) ([#35347](#35347)) ([7506132](7506132))
* error while saving job card ([d6427cf](d6427cf))
* get_query filters ([2aa7729](2aa7729))
* Incorrect Earned Leaves Proration ([#35156](#35156)) ([dc04b24](dc04b24))
* linter ([0a42e6f](0a42e6f))
* non manufacturing items/fixed asset items in BOM ([66ba74f](66ba74f))
* Pick List TypeError ([137898d](137898d))
* tds incorrectly calculated for invoice that are below threshold ([6c170ab](6c170ab))
* **test:** cumulative threshold checks ([06deecb](06deecb))
* use flt instead of mandatory field ([f63b866](f63b866))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants