* fix: not able to make purchase receipt from SCR (#44919)
(cherry picked from commit ab1cca0c40)
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)
* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order
* refactor(new_sc_flow_2): Fixed error thrown by semgrep
(cherry picked from commit 3eba6bf3dd)
# Conflicts:
# erpnext/buying/doctype/purchase_order/purchase_order.js
# erpnext/buying/doctype/purchase_order/test_purchase_order.py
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
# erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
# erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)
* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order
* refactor(new_sc_flow_2): Fixed error thrown by semgrep
* fix: Resolved errors and removed code from develop branch merged by mistake
---------
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
* fix: rounding issue of required qty in subcontracting order
* fix: uom issue in test case
* fix: test case
* fix: restored report tests for manufacturing
fix: incorrect value of available_qty_for_consumption in subcontracti… (#43836)
fix: incorrect value of available_qty_for_consumption in subcontracting receipt
(cherry picked from commit ad6ce09b86)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: allow to change the batch in the subcontracting receipt (#43584)
(cherry picked from commit fc67867a60)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: fields renaming and reordering for enhanced user experience
* fix: dashboard data for stock entry
(cherry picked from commit 302339998f)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
fix: address and contact filters for SCO and SCR (#42310)
(cherry picked from commit 7656220075)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: not able to delete line items in the subcontracting receipt (#41569)
(cherry picked from commit 4261c3474b)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: use serial batch fields for subcontracting receipt (#40311)
(cherry picked from commit cef6291311)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* feat: provision to close SCO
(cherry picked from commit 5e2669f4b6)
* fix: don't allow to submit/cancel SCR against a closed SCO
(cherry picked from commit 9e973476b2)
* fix: don't allow to submit/cancel SE against a closed SCO
(cherry picked from commit 5bc2035bd0)
* fix(ux): filter closed SCO in `Get Items From` dialog
(cherry picked from commit bb839b2924)
* fix: don't close PO on SCO close
(cherry picked from commit 0d01bd8a5a)
* fix: update qty on SCO status change
(cherry picked from commit 245effcccd)
* fix: don't allow to reopen SCO if PO is closed
(cherry picked from commit 784b6dcfea)
* fix: auto close and reopen SCO based on PO status
(cherry picked from commit 0819675fce)
* fix(text): test_update_status
(cherry picked from commit cdd5441435)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: not able to cancel SCR with Batch (backport #38817) (#38821)
* fix: not able to cancel SCR with Batch (#38817)
(cherry picked from commit fb5090fd3f)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
* chore: fix test case
* chore: fix test case
* chore: fix test case
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 71e833c3f2)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* feat: add field `Action on Purchase Order Submission`
(cherry picked from commit 628ea42b63)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: auto create SCO on PO submission
(cherry picked from commit 9ec6f1e1d6)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: add field `Action on Subcontracting Receipt Submission`
(cherry picked from commit 762906f240)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* chore: notify user on SCO creation
(cherry picked from commit 745e3bfb73)
* feat: add field `Purchase Order Item` in SCO Service Item
(cherry picked from commit 45d5cff47d)
* fix: hold PO item ref in SCO Service Item
(cherry picked from commit 7e4dd33ab0)
* feat: add field `Purchase Order Item` in SCO Item
(cherry picked from commit a2ede7d6d5)
* fix: maintain PO and PO Item ref in SCR Item
(cherry picked from commit e1cea25781)
* feat: auto create PR on SCR submission
(cherry picked from commit 040cc8d22f)
* feat: add `Purchase Order` link in SCR connections
(cherry picked from commit ca8a5b45ba)
* feat: add `Subcontracting Receipt` link in PO connections
(cherry picked from commit 98cba5ed30)
* fix: dont show `View` button on cancelled SCR
(cherry picked from commit dd80d3b9b9)
* fix: use checkbox instead of select field
(cherry picked from commit d366a91d9e)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: Subcontracting Receipt ref in Purchase Receipt
(cherry picked from commit d891bd7fac)
* feat: SCR Item ref in PR Item
(cherry picked from commit 37b3ac7952)
* feat: provision to create PR from SCR
(cherry picked from commit 8052103197)
* chore: PR ref in SCR connections
(cherry picked from commit 096a2c8cd0)
* fix: map warehouses in return SCR
(cherry picked from commit 874766a82f)
* fix(ux): hide `Create Purchase Receipt` button for Subcontract Return
(cherry picked from commit 7145b040f1)
* chore: `linter`
(cherry picked from commit 857f2b5a01)
* test: auto create SCO on PO submit
(cherry picked from commit 68585f6f2b)
* test: auto create PR on SCR submit
(cherry picked from commit 7b0cd03f88)
* fix(test): `test_auto_create_purchase_receipt`
(cherry picked from commit 3da0aa6a0b)
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094)
fix: valuation rate for the subcontracting receipt supplied items with batch
(cherry picked from commit 3e77c0b564)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
chore: refetch item images on transaction save (#38095)
chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
* feat: allow return of components for SCO that don't have SCR created
(cherry picked from commit 8e3b9ec879)
* fix: consider returned qty while calculating unsupplied qty
(cherry picked from commit 3290df5593)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
