Commit Graph

256 Commits

Author SHA1 Message Date
ruthra kumar
12ae84401a refactor(test): remove redundant tearDown, tearDownClass and rollback 2026-03-18 20:59:37 +05:30
ruthra kumar
d119e3a8e8 refactor(test): make subcontracting receipt deterministic 2026-03-18 20:59:37 +05:30
ruthra kumar
ee8e96dbcf refactor(test): make subcontracting order deterministic 2026-03-18 20:59:37 +05:30
ruthra kumar
33f4791698 refactor: replace IntegrationTestCase with ERPNextTestCase repo-wide
- import ERPNextTestSuite
 - use it on test class
2026-03-18 20:59:35 +05:30
Mihir Kandoi
f1ac0376fb feat: co product by product support (#52979) 2026-03-11 14:46:36 +05:30
Rohit Waghchaure
82c3da5b1e feat: option to enable serial / batch features 2026-03-06 11:47:53 +05:30
Mihir Kandoi
74b658fabf fix: some type hints 2026-03-04 16:31:28 +05:30
Rohit Waghchaure
d90ec49241 fix: patch to complete onboarding stpes for existing records 2026-02-25 17:23:57 +05:30
Rohit Waghchaure
792a1a7ab7 feat: module onboarding 2026-02-24 11:45:31 +05:30
Mihir Kandoi
37323480dd fix: unable to submit subcontracting order if created from material request 2026-02-19 10:50:26 +05:30
Mihir Kandoi
1bc0b40a2e refactor(subcontracting): add arg type hints to functions 2026-02-18 12:01:24 +05:30
Mihir Kandoi
671726a3e4 Merge pull request #52259 from aerele/fix/support-#58787 2026-02-03 20:24:43 +05:30
Sudharsanan11
de8f8ef9f4 fix(stock): include subcontracting order qty while calculating the bin qty 2026-02-03 15:37:15 +05:30
Sudharsanan11
4d9412181c test(subcontracting): add test for consumed_qty calculation with similar finished goods 2026-02-02 22:52:30 +05:30
ljain112
37ee560eae fix: calculate weighted average rate for customer provided items in subcontracting inward order 2026-01-20 18:48:59 +05:30
ljain112
e8510287e3 chore: remove unused imports 2026-01-17 14:45:57 +05:30
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