* fix: don't set rate for non-stock item in Internal Transfer
(cherry picked from commit e1b0fffd0c934d376562e3ba8707b38426ea09a1)
* test: internal transfer for non-stock item
(cherry picked from commit 57b6a987034522266caca853d4ee26316526e526)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
* feat: provision to close SCO
(cherry picked from commit 5e2669f4b6e8ed917cc8e882b49a4a617a854464)
* fix: don't allow to submit/cancel SCR against a closed SCO
(cherry picked from commit 9e973476b2a925d4557b3a6b17517e46d652ac20)
* fix: don't allow to submit/cancel SE against a closed SCO
(cherry picked from commit 5bc2035bd082001e2552138a5df55554f2e6f8de)
* fix(ux): filter closed SCO in `Get Items From` dialog
(cherry picked from commit bb839b2924c2dd4c2a06b087d7624ca7aac08f04)
* fix: don't close PO on SCO close
(cherry picked from commit 0d01bd8a5a49f5bba80ef797d5823f762e0fc86a)
* fix: update qty on SCO status change
(cherry picked from commit 245effcccd3866bac2974023d37cd48b89849aeb)
* fix: don't allow to reopen SCO if PO is closed
(cherry picked from commit 784b6dcfea2aa9eb3fe557bb4f87cdc1f7341560)
* fix: auto close and reopen SCO based on PO status
(cherry picked from commit 0819675fce1cffe3a930fe2cbd015998e4e7c00d)
* fix(text): test_update_status
(cherry picked from commit cdd5441435ee448d3efb2155a93865ec29bbf8ab)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: on cancellation of document cancel the serial and batch bundle (#39076)
(cherry picked from commit 6e5484ea031027de4e6a897b02bd0f2e7b8adda9)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: non stock uom validation for serial and batch (#39018)
* fix: non stock uom validation for serial and batch
* test: delivery note for batch with non stock uom
(cherry picked from commit 0c6de4ecb299daf5359fcd51041942a26f94693d)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: work order with multi level, fetch operting cost from sub-assembly (#38992)
(cherry picked from commit 70abedc57ad2147719c23537ab9aaf348d6e9182)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: serial and batch bundle company mandatory error (#38994)
(cherry picked from commit 10074e9980c8f2a1473827c61c888d970da4b73a)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: incorrect qty in serial batch bundle against pick list (#38964)
(cherry picked from commit 47ee801d373058a2739c2fd42d971d624c42d5a7)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: not able to import serial batch bundle using csv (#38950)
(cherry picked from commit d00f6672a8d9db1e28f9a86ff8efbedcdc95c41a)
# Conflicts:
# erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
* chore: fixed conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: do not make serial batch bundle for zero qty (#38949)
(cherry picked from commit 06d6220a2aa2f7855db2c2f985d046280e26f13a)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix(ux): make PI Item rate field editable
(cherry picked from commit eb5bb9f9a99e54be71c7ae5e24235b5b44692444)
* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit cb9114442b936f03c9c975900282b3b9db62e453)
* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit b1ba2103323c8bfe066c288b4c285cf1f3c5b20b)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: do not reset the basic rate for the material receipt stock entry (#38896)
(cherry picked from commit 98bfcc4c758b61f714c53ea0f00246731a30fdaf)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: if not budget then don't validate (#38861)
(cherry picked from commit d375164100158db9b974742caa3e05062c481d7d)
Co-authored-by: rohitwaghchaure <rohitw1991@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 fb5090fd3f23ada507fe8abc5a899f4b06e48d7e)
# 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 71e833c3f2323873953c3ad7ab4a9403ebbdeb0a)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
perf: index `return_against` on delivery note (#38827)
There's a multi-column index but that's useful IFF all parts of column
are part of query.
return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
(cherry picked from commit 8d79365e0ddef42e788f97c668a64c479a803617)
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: serial and batch bundle return not working (#38754)
* fix: serial and batch bundle return not working
* test: added test case for delivery note return against denormalized serial no
(cherry picked from commit 0743289925d0866a16373c05cfb81825b58e35ba)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: incorrect available qty for backdated stock reco with batch (#37858)
* fix: incorrect available qty for backdated stock reco with batch
* test: added test case
(cherry picked from commit d4c0dbfacc7e99da6cba2c5d389f0a662490b0eb)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix(ux): don't override Item Name and Description in MR
(cherry picked from commit 726ac6bda1ee3b25c1d62b312d96aa32466ba11e)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: not able to make serial and batch using csv import (#38659)
(cherry picked from commit 89a0e9c2453ba4eef4158477db537771cdc9ed70)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: auto delete draft serial and batch bundle (#38637)
(cherry picked from commit 89326bd657217b82e14675ebb464b87214332eec)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: serial and batch bundle permission (#38618)
(cherry picked from commit 231ab83562cd972ebc7663e1a86f82080e3b27cd)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: scan for serial or batch in bundle (#38534)
(cherry picked from commit c8693cdf37ba9e91bf47d89de69aafc2fde5e6ed)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix: validation error has not throw for the batch (#38494)
* fix: validation error has not throw for the batch
* chore: fix test cases
(cherry picked from commit 5e9016ffab34df9609a75a7cbbaabbb37e7159d6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix(ux): make `basic_rate` field read-only based on purpose
(cherry picked from commit abc7d3002467946984be5b41d79024da92047dd3)
* fix(ux): make PR `rate` field read-only having PO ref
(cherry picked from commit ae294ee4702fa8e0367c07c881d632811beb67ae)
* fix(ux): make PI `rate` field read-only having PR ref
(cherry picked from commit 3d4156cc7d90522f37f4c91e4ccf4145412109a9)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
* feat: add field `Action on Purchase Order Submission`
(cherry picked from commit 628ea42b63217fcf64c9803fdfdad09c610b00c3)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: auto create SCO on PO submission
(cherry picked from commit 9ec6f1e1d63ccb8087cb3f95c6a100b02d22ba79)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: add field `Action on Subcontracting Receipt Submission`
(cherry picked from commit 762906f24023af3f0fdba70c5dbf61951f45dd68)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* chore: notify user on SCO creation
(cherry picked from commit 745e3bfb733bdbce034b9b1fb3cd83a502a423a7)
* feat: add field `Purchase Order Item` in SCO Service Item
(cherry picked from commit 45d5cff47d7fc53fcf710afac281907ba9ab9e00)
* fix: hold PO item ref in SCO Service Item
(cherry picked from commit 7e4dd33ab0da2800fdb4aeb89ef9d183bff19d4d)
* feat: add field `Purchase Order Item` in SCO Item
(cherry picked from commit a2ede7d6d5241665d996447a1c9e2d1447190066)
* fix: maintain PO and PO Item ref in SCR Item
(cherry picked from commit e1cea2578151ee0f43e1809a7f99d2e90bf774a6)
* feat: auto create PR on SCR submission
(cherry picked from commit 040cc8d22f700a1823425d1534b91d50289d2489)
* feat: add `Purchase Order` link in SCR connections
(cherry picked from commit ca8a5b45ba58b62cd661dae508af9b0e26ff7973)
* feat: add `Subcontracting Receipt` link in PO connections
(cherry picked from commit 98cba5ed30ed2c8f5191d7cfaac54b16997cf09e)
* fix: dont show `View` button on cancelled SCR
(cherry picked from commit dd80d3b9b94c970d5070e1a5fac03cf9f1fbc455)
* fix: use checkbox instead of select field
(cherry picked from commit d366a91d9eae52175cd7f10f8a77b96dc09bfd00)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
* feat: Subcontracting Receipt ref in Purchase Receipt
(cherry picked from commit d891bd7fac1ab9e46a94959dedcc45e18ac69de5)
* feat: SCR Item ref in PR Item
(cherry picked from commit 37b3ac795284c0ee9593753ececcfe4871e538a4)
* feat: provision to create PR from SCR
(cherry picked from commit 8052103197112d2e1abe7ac35a831267ad9549b7)
* chore: PR ref in SCR connections
(cherry picked from commit 096a2c8cd0afafb28e916a5c9e92ef1eb041e0a3)
* fix: map warehouses in return SCR
(cherry picked from commit 874766a82f1b31a55b8d5c9c998896748ad49cdf)
* fix(ux): hide `Create Purchase Receipt` button for Subcontract Return
(cherry picked from commit 7145b040f12a62be9f0ac945c69ac221debd7c03)
* chore: `linter`
(cherry picked from commit 857f2b5a014b4d14d21bca793ea569f8bdc1c398)
* test: auto create SCO on PO submit
(cherry picked from commit 68585f6f2b05e0b8dc3429741950ef31bbc42e17)
* test: auto create PR on SCR submit
(cherry picked from commit 7b0cd03f88a7052460438ee70390799fae5c336c)
* fix(test): `test_auto_create_purchase_receipt`
(cherry picked from commit 3da0aa6a0b21c775e5356ae7d359f7378f190d92)
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: serial no status (#38391)
(cherry picked from commit 592fc81260779ec42b35c88c6b8de19a598911d0)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix(ux): no need to select rows to reserve the stock
(cherry picked from commit 9c889b37fb3e6572043c7a28706e43d051e2ff46)
* fix: use field `sales_order_item` instead `name`
(cherry picked from commit 73586fd9b2f9392d18f65a063b14ef2de2629615)
* fix(ux): no need to select rows to unreserve the stock
(cherry picked from commit 2a41da94d443dee51e615b395d18ad161d4e87fc)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
fix: set asset's valuation_rate according to asset quantity (#38254)
(cherry picked from commit e2bb4e2baa9059afb27f685beb88172a615097a4)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
