124 Commits

Author SHA1 Message Date
mergify[bot]
4bd1a5f955
fix: not able to cancel SCR with Batch (backport #38817) (backport #38821) (#38829)
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>
2023-12-18 18:13:15 +05:30
mergify[bot]
4055543f5d
fix: close PO on SCO close (backport #38667) (#38681)
fix: close PO on SCO close

(cherry picked from commit b023e5d6b3af376a22397c51f4ec8939da463686)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-12 13:40:30 +05:30
Rohit Waghchaure
abe3e41a17 fix: incorrect requested quantity for the subcontracting order
(cherry picked from commit 691e3bb24fe62624cd2c39f88e7663ff690b0f1c)
2023-11-30 13:39:06 +00:00
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452) (#38454)
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f6618f52c7e6194f7abd345cf920b15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-11-30 14:43:16 +05:30
mergify[bot]
e06669847d
fix: exploded items in Subcontracting Receipt (backport #38441) (#38445)
fix: exploded items in Subcontracting Receipt

(cherry picked from commit 62b4a263f86a15dc39cd62b4fa39df87f0ec0dfa)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-30 12:16:07 +05:30
mergify[bot]
7005d51af3
feat: auto create PR on SCR submission (backport #38290) (#38428)
* 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>
2023-11-30 12:11:05 +05:30
rohitwaghchaure
71fe2bcc28 fix: incorrect ordered qty for Subcontracting Order (#38415)
(cherry picked from commit fddf341f444efa89f80ec0fcb4e35b9b840061f5)
2023-11-29 06:52:36 +00:00
mergify[bot]
ed7b845a55
fix: valuation rate for FG item for subcontracting receipt (backport #38244) (#38245)
fix: valuation rate for FG item for subcontracting receipt (#38244)

(cherry picked from commit 5c308a4f9aa1a27cbd216addbe495b9bf69735b1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-21 14:53:03 +05:30
mergify[bot]
b89a4a7218
feat: add Supplier Delivery Note field in SCR (backport #38127) (#38156)
feat: add `Supplier Delivery Note` field in SCR

(cherry picked from commit da80e4dbce07707d57e3739b7bb2138adf199905)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-17 22:07:53 +05:30
mergify[bot]
28e6e5d910
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport #38094) (#38097)
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 3e77c0b5644c28ed9b4eef22b228fdc4a1283020)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-14 21:15:44 +05:30
mergify[bot]
77b1eedcf4
chore: refetch item images on transaction save (backport #38095) (#38099)
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5d45a3bf0136ca3fc24a828b008aeee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-11-14 20:11:19 +05:30
mergify[bot]
a8749977e1
fix: Not able to save subcontracting receipt (#38085)
fix: Not able to save subcontracting receipt (#38085)

(cherry picked from commit e769e750ec712872a8fd28c533d1f02444e351a9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-14 15:57:36 +05:30
mergify[bot]
40443258cf
feat: allow return of components for SCO that don't have SCR created (backport #37686) (#37693)
* feat: allow return of components for SCO that don't have SCR created

(cherry picked from commit 8e3b9ec87977b54cfdee4b65283723d20e91f274)

* fix: consider returned qty while calculating unsupplied qty

(cherry picked from commit 3290df5593009a4e237e7903feb078961f15ae12)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-26 11:56:27 +05:30
HENRY Florian
34bb64e41a
fix(ux): move get_route_options_for_new_doc to refresh (#37096)
fix: move `get_route_options_for_new_doc` to `refresh`
2023-09-16 15:59:09 +05:30
s-aga-r
ce549ce9b2
fix(ux): filters for SCR Item Serial and Batch Bundle (#37013) 2023-09-10 17:10:04 +05:30
s-aga-r
cd8ddae7c5
refactor: remove Recalculate Rate from SCR Item (#36929) 2023-09-03 18:54:44 +05:30
s-aga-r
22cf1556cd
feat: Service Item and Finished Good Map (#36647)
* feat: new DocType `Service Item and Finished Good Map`

* fix(ux): filters for Service Item and Finished Good

* fix: validations for Service Item and Finished Good

* feat: set FG Item on Service Item selection in PO

* refactor: one-to-many mapping between service item and finished goods

* feat: auto set Service Item for finished good in PO created from PP

* feat: auto set Service Item on Finished Good selection in PO

* test: add test case for service item and finished goods map

* feat: `BOM` field in `Finished Good Detail`

* feat: new DocType `Subcontracting BOM`

* fix: filters and validations for Subcontracting BOM

* feat: auto select Service Item in PO created from PP

* test: add test case for PO service item auto pick

* feat: pick BOM from Subcontracting BOM in SCO

* feat: auto pick `Service Item` on FG select

* refactor: remove DocType `Service Item and Finished Goods Map` and `Finished Good Detail`

* feat: fetch FG for Service Item

* chore: `linter`

* refactor: update `Auto Name` expression for Subcontracting BOM
2023-09-03 11:59:28 +00:00
s-aga-r
9d330a13ed fix: get Valuation Rate instead of BOM rate 2023-08-28 16:09:05 +05:30
s-aga-r
592c7b5ff1 fix: test cases 2023-08-28 15:32:08 +05:30
s-aga-r
ffcbcd7397 test: add test case for SCR scrap items 2023-08-28 00:12:19 +05:30
s-aga-r
27d56461c5 Merge branch 'develop' into SCR-SCRAP-ITEMS 2023-08-26 12:07:58 +05:30
s-aga-r
ed4f498704 feat: allow scrap items when backflush based on is Material Transfer 2023-08-26 11:38:45 +05:30
s-aga-r
08bc33689c fix(ux): make Get Scrap Items button hidden for submitted and cancelled doc 2023-08-26 10:57:49 +05:30
s-aga-r
c8d7433e30 refactor(minor): subcontracting_receipt.js 2023-08-25 20:23:39 +05:30
s-aga-r
1504ff8b6c fix: ignore scrap items while distribute additional cost 2023-08-25 20:18:30 +05:30
s-aga-r
879d31a588 fix: recalculate rate while getting scrap items 2023-08-25 16:13:08 +05:30
s-aga-r
9b47617117 feat: button to get Scrap Items 2023-08-25 10:53:13 +05:30
s-aga-r
7a6db924d5 fix: validate scrap items 2023-08-25 09:56:48 +05:30
s-aga-r
199071b773 fix(ux): make Recalculate Rate field hidden for scrap items 2023-08-25 09:36:12 +05:30
s-aga-r
40a6b5cefe fix: don't recalculate rate for scrap items 2023-08-25 09:35:29 +05:30
s-aga-r
a6b2cf3acd fix: reduce scrap cost from FG total cost 2023-08-25 07:30:55 +05:30
s-aga-r
794edbb334 feat: add Scrap Cost Per Qty field in SCR Item 2023-08-24 22:02:29 +05:30
s-aga-r
f78b6d0081 refactor: code cleanup 2023-08-24 18:56:16 +05:30
s-aga-r
a33b75f2cd feat: allow manually entry for scrap items in SCR 2023-08-24 16:37:57 +05:30
s-aga-r
d1e877b6f0 refactor: Subcontracting Receipt Item form view 2023-08-24 12:16:12 +05:30
s-aga-r
4e7cccbdf0 feat: Is Scrap Item field in Subcontracting Receipt Item 2023-08-24 11:53:09 +05:30
s-aga-r
49be1190d9
Merge pull request #36786 from s-aga-r/SCR-QI
feat: `Quality Inspection` for Subcontracting Receipt
2023-08-24 11:06:51 +05:30
s-aga-r
8010a157b1 fix: use flt for qty and rate fields 2023-08-24 11:06:19 +05:30
s-aga-r
f31eb74234 test: add test case for SCR Quality Inspection 2023-08-24 10:22:21 +05:30
s-aga-r
723563c167
fix: SCR return status (#36793) 2023-08-24 10:13:47 +05:30
s-aga-r
3fab6610cb feat: setup Quality Inspection for Subcontracting Receipt
- SCR[docstatus=0, is_return=0] Create > Quality Inspection(s)
- Filters for Quality Inspection field in Subcontracting Receipt Items table
2023-08-23 13:58:40 +05:30
s-aga-r
3fdcd33b92 feat: Quality Inspection in Subcontracting Receipt 2023-08-23 12:15:35 +05:30
s-aga-r
758b31d895
fix: get incoming rate instead of BOM rate (#36496)
* fix: get incoming rate instead of BOM rate

* test: add test case for SCR rm rate
2023-08-05 19:28:38 +05:30
Deepesh Garg
0b1e78e127 chore: Add landed cost taxes and charges common in bundles 2023-07-22 21:19:48 +05:30
Rohit Waghchaure
d618aaef32 fix: accepted warehouse and rejected warehouse can't be same 2023-07-10 13:19:17 +05:30
s-aga-r
2f6d56dd62 fix: don't update SCO status to closed until full return 2023-06-29 18:44:40 +05:30
s-aga-r
4b5454c752 fix(ux): set route options for new SBB 2023-06-16 15:04:37 +05:30
rohitwaghchaure
4820221a41
Merge pull request #35636 from s-aga-r/FIX-SBB-AttributeError
fix: miscellaneous
2023-06-14 16:02:04 +05:30
s-aga-r
7549a5c371 fix(ux): add filters for SBB 2023-06-14 15:04:51 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes (#35549) 2023-06-11 19:34:41 +05:30