mergify[bot]
610735d1c5
fix: preserve inventory dimensions when raw materials are reset (backport #54440 ) (backport #54493 ) ( #54513 )
...
* fix: preserve inventory dimensions when raw materials are reset (backport #54440 ) (#54493 )
fix: preserve inventory dimensions when raw materials are reset (#54440 )
* fix: preserve inventory dimensions when raw materials are reset
* test: add test case
(cherry picked from commit 0e20e35842 )
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
(cherry picked from commit 456e99b352 )
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflicts
---------
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2026-04-24 12:33:34 +00:00
Mihir Kandoi
8db397bdae
feat: co product by product support ( #52979 ) ( #53975 )
2026-04-01 07:41:39 +00:00
ruthra kumar
63908ad6dc
refactor(test): remove redundant tearDown, tearDownClass and rollback
2026-03-19 12:57:11 +05:30
ruthra kumar
83d1f53eb1
refactor(test): make subcontracting receipt deterministic
2026-03-19 12:57:11 +05:30
ruthra kumar
020e28235a
refactor(test): make subcontracting order deterministic
2026-03-19 12:57:11 +05:30
ruthra kumar
f1dfac417d
refactor: replace IntegrationTestCase with ERPNextTestCase repo-wide
...
- import ERPNextTestSuite
- use it on test class
2026-03-19 12:57:07 +05:30
Rohit Waghchaure
93a597410e
feat: option to enable serial / batch features
...
(cherry picked from commit 82c3da5b1e )
# Conflicts:
# erpnext/patches.txt
2026-03-06 06:48:17 +00:00
Rohit Waghchaure
941a78e1a8
fix: patch to complete onboarding stpes for existing records
...
(cherry picked from commit d90ec49241 )
# Conflicts:
# erpnext/patches.txt
2026-02-25 12:30:24 +00:00
Rohit Waghchaure
858119f907
feat: module onboarding
...
(cherry picked from commit 792a1a7ab7 )
2026-02-24 07:20:09 +00:00
Mihir Kandoi
c5bc92d50e
fix: unable to submit subcontracting order if created from material request
...
(cherry picked from commit 37323480dd )
2026-02-19 13:44:30 +05:30
Sudharsanan11
de244e0af7
fix(stock): include subcontracting order qty while calculating the bin qty
...
(cherry picked from commit de8f8ef9f4 )
2026-02-03 14:55:27 +00:00
Sudharsanan11
a3190dd556
test(subcontracting): add test for consumed_qty calculation with similar finished goods
...
(cherry picked from commit 4d9412181c )
2026-02-03 03:40:18 +00:00
ljain112
7120fbd14b
fix: calculate weighted average rate for customer provided items in subcontracting inward order
...
(cherry picked from commit 37ee560eae )
2026-01-22 05:02:16 +00:00
Mihir Kandoi
87d00a373f
Merge pull request #51305 from mihir-kandoi/gh45824
2025-12-31 09:26:38 +00:00
Lakshit Jain
c66f78c784
feat: Introduce tax withholding entry
2025-12-23 20:47:53 +05:30
Rohit Waghchaure
3b221b0078
fix: chart and number cards for subcontracting
2025-12-19 16:58:29 +05:30
Kavin
2f19244660
fix(subcontract): ignore BOM qty validation for alternative items ( #51122 )
2025-12-16 17:26:34 +05:30
Mihir Kandoi
c287665033
fix: rejected qty not outward-ed in SCR
2025-12-16 11:23:19 +05:30
Mihir Kandoi
ec3cd7e09c
feat: add return status
2025-12-09 16:15:58 +05:30
Kavin
d01c4b68fe
fix: add validation for FG Items as per BOM qty ( #50579 )
...
Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com >
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com >
2025-11-24 06:17:14 +00:00
Pugazhendhi Velu
57f9353d90
fix(manufacturing): apply precision for bom amount and rm_cost_per_qty
2025-11-19 14:19:26 +00:00
rohitwaghchaure
b5df39f47d
Merge pull request #50388 from rohitwaghchaure/feat-subcontracting-workspace
...
feat: subcontracting workspace and sidebar
2025-11-17 13:08:50 +05:30
Mihir Kandoi
9b303a2272
Merge pull request #50235 from mihir-kandoi/sre-sco
...
feat: stock reservation for subcontracting order
2025-11-16 13:06:21 +05:30
Mihir Kandoi
b98f4611e6
fix: wrong currency in Subcontracting Order Service Item ( #50517 )
2025-11-14 05:21:06 +00:00
maasanto
722581cf05
Merge pull request #48912 from maasanto/dont-set-description
2025-11-11 10:15:15 +05:30
Rohit Waghchaure
8ef18754a0
feat: subcontracting workspace and sidebar
2025-11-06 15:48:10 +05:30
Saad Chaudhary
8854db51dd
Merge pull request #50299 from saadchaudharry/feature-subcontract-return-rejected
...
Add support for subcontract return from rejected warehouse
2025-11-04 14:14:34 +05:30
Mihir Kandoi
553ec40d4a
fix: minor issues in subcontracting inward
2025-11-03 17:56:15 +05:30
Rohit Waghchaure
076407ad70
test: test cases for item wise inventory account
2025-10-24 10:08:44 +05:30
Rohit Waghchaure
74192547ce
feat: enable item wise inventory account
2025-10-23 22:41:04 +05:30
Mihir Kandoi
9f3cb4b783
fix: feat: multiple changes related to subcontracting inward
2025-10-21 23:51:07 +05:30
Mihir Kandoi
cf97c1db38
fix: add delivery warehouse filter
2025-10-14 16:08:50 +05:30
Mihir Kandoi
ae816d0c1d
fix: restore customer field
2025-10-14 16:02:58 +05:30
Mihir Kandoi
f2b948a483
feat: subcontracting inward ( #47728 )
...
* feat: subcontracting inward
* feat: stock reservation
* feat: subcontracting delivery
* feat: all remaining stuff
* fix: linter errors
* fix: patch
* fix: modify stock entry type validation
* fix: customer provided item cost field mandatory validation
* fix: failing tests
* fix: failing tests
* fix: subcontracting controlller
* refactor: semi final
* refactor: final
* chore: resolve conflicts
* refactor: changes requested
* fix: reservation transfer of extra qty
* fix: consider add cost for customer provided rate field
* test: create test data
* test: subcontracted sales order (partial)
* test: fin
* fix: do not add self RM in DN created from SI
* fix: failing test case
* fix: conflicting function name
* refactor: final changes
* fix: more bugs
* perf: various and major performance improvements
* fix: consider warehouse as well in all queries
* fix: same item code with diff warehouse in manufacture entry
* refactor: readability
* fix: frontend validations
* perf: replace query inside loop with single query
* fix: set additional item flag to true when extra customer provided item is received
* fix: bugs found by coderabbit
* fix: more coderabbit bugs
* fix: add validation to disallow cancellation of manufacturing entry
* perf: use cached values wherever it makes sense
* test: fix redundant insert to child tables
* fix: consider SI return of billed self RM
* fix: bug found by coderabbit
---------
Co-authored-by: Mihir Kandoi <mihirkandoi@Mihirs-MacBook-Air.local >
2025-10-14 15:00:49 +05:30
Rohit Waghchaure
ec1636db12
fix: reset raw materials considering not available batches
2025-10-13 17:29:52 +05:30
Rohit Waghchaure
128e243945
fix: Reset Raw Materials Table button not working
2025-10-08 21:46:17 +05:30
venkat102
81614939ab
fix: convert with flt
2025-09-29 18:09:02 +05:30
venkat102
89a603f20c
fix: use get_value instead of get_doc
2025-09-29 17:25:06 +05:30
venkat102
ea63bfc9af
fix: update subcontracted_quantity with set_value
2025-09-29 17:23:38 +05:30
Rohit Waghchaure
6e597b9c42
feat: service expense account in the subcontracting receipt
2025-09-26 19:45:17 +05:30
Rohit Waghchaure
23f9d4c600
fix: auto batch not set for raw materials in subcontracting receipt
2025-09-26 09:23:49 +05:30
Karm Soni
b7470617e0
chore: add default value for posting_time field in subcontracting receipt
2025-08-13 12:55:14 +05:30
Rohit Waghchaure
af7dc363e1
perf: process_gl_map causing performance issues in the reposting
...
(cherry picked from commit a96fa55704 )
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
2025-08-03 09:46:15 +00:00
ravibharathi656
d163da171f
fix: set letter head from company if exists
2025-07-24 14:55:21 +05:30
Mihir Kandoi
bc6f69ad54
perf: optimize code for subcontracting
2025-07-15 11:55:03 +05:30
Mihir Kandoi
f40c78f838
Merge pull request #48078 from mihir-kandoi/st41233
...
fix: fallback expense account and cost center in subcontracting receipt
2025-06-24 11:48:51 +05:30
Sagar Vora
7e897c4a5d
Merge branch 'develop' into use-frappe.in_test
2025-06-20 08:09:35 +00:00
Rohit Waghchaure
2f50ddae85
fix: adjustment entries for SE and SCR after LCV
2025-06-19 17:24:30 +05:30
Sagar Vora
7a482a6998
chore: use frappe.in_test
2025-06-17 21:28:21 +05:30
Rohit Waghchaure
6be6eab6ff
feat: LCV for Work Order and Subcontracting Receipt
2025-06-16 20:18:55 +05:30