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

feat: allow the partial return of components against SCO #35935

Merged
merged 2 commits into from
Jun 29, 2023

Conversation

s-aga-r
Copy link
Contributor

@s-aga-r s-aga-r commented Jun 29, 2023

Before:

Screencast.from.06-29-2023.07.16.28.PM.webm

After:

Screencast.from.06-29-2023.07.27.39.PM.webm

closes: #35864

no-docs

@s-aga-r s-aga-r added the backport version-14-hotfix backport to version 14 label Jun 29, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 29, 2023
@s-aga-r s-aga-r removed the needs-tests This PR needs automated unit-tests. label Jun 29, 2023
@codecov
Copy link

codecov bot commented Jun 29, 2023

Codecov Report

Merging #35935 (2a60884) into develop (50cbdc7) will decrease coverage by 0.03%.
The diff coverage is 100.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #35935      +/-   ##
===========================================
- Coverage    64.17%   64.15%   -0.03%     
===========================================
  Files          812      813       +1     
  Lines        62191    62214      +23     
===========================================
- Hits         39914    39911       -3     
- Misses       22277    22303      +26     
Impacted Files Coverage Δ
erpnext/controllers/subcontracting_controller.py 88.36% <100.00%> (-0.07%) ⬇️
...ctype/subcontracting_order/subcontracting_order.py 90.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

@s-aga-r s-aga-r marked this pull request as ready for review June 29, 2023 15:50
@s-aga-r s-aga-r merged commit fe4161e into frappe:develop Jun 29, 2023
@s-aga-r s-aga-r changed the title chore: allow partial return of components against SCO feat: allow the partial return of components against SCO Jun 29, 2023
s-aga-r added a commit that referenced this pull request Jun 29, 2023
…5935) (#35938)

* fix: don't update SCO status to closed until full return

(cherry picked from commit 2f6d56d)

* fix: reduce return qty while calculating transferred qty

(cherry picked from commit 2a60884)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jul 5, 2023
# [14.29.0](v14.28.1...v14.29.0) (2023-07-05)

### Bug Fixes

* Expense Account filter in Sales Invoice ([#35944](#35944)) ([a485e4e](a485e4e))
* get base grand total while pulling reference details in PE ([2e2c23a](2e2c23a))
* handle loan_repayment's posting_date datetime in bank_clearance_summary report ([#36004](#36004)) ([937e1fb](937e1fb))
* Netherlands - Grootboekschema COA structure ([#35991](#35991)) ([13f3ebf](13f3ebf))
* project filtering based on company in P&L Report ([#35943](#35943)) ([8de1d86](8de1d86))
* remove debug flag from sql ([646440f](646440f))
* reposting has not changed valuation rate ([c0c693d](c0c693d))
* Update no copy for received_qty field ([#35965](#35965)) ([c330f47](c330f47))

### Features

* **accounts:** standardize additional columns implementation for sales/purchase reports ([#36000](#36000)) ([47c6d90](47c6d90))
* add method for ordered quantity in supplier scorecard (backport [#35930](#35930)) ([#35968](#35968)) ([a974091](a974091))
* add voucher-wise balance report logic ([6842902](6842902))
* allow the partial return of components against SCO (backport [#35935](#35935)) ([#35938](#35938)) ([6f50ad6](6f50ad6))
@s-aga-r s-aga-r deleted the FIX-35898 branch July 27, 2023 08:12
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Subcontracting order Closed after partially receiving raw material
1 participant