nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 18:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,100 Commits 463 Branches 1,750 Tags
4e700059379f4c9444faaf3133b3d9978e0c40f7
Commit Graph

58 Commits

Author SHA1 Message Date
Mihir Kandoi
ca56150918 fix: ignore backflush setting on subcontracting return 
(cherry picked from commit 7479e1ec32)
 2025-04-08 12:15:44 +00:00
Rohit Waghchaure
c5efddae16 fix: decimal values causing incorrect batch picking 
(cherry picked from commit 7bfe703b04)
 2025-03-26 10:13:40 +00:00
mergify[bot]
d5f07f06c7 refactor: rename subcontracting fields (backport #46226) (#46301) 
* refactor: rename subcontracting fields

(cherry picked from commit b4f65154f5)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-03-05 14:08:10 +05:30
Mihir Kandoi
5319683dbf fix: subcontracting valiation precision issue 
(cherry picked from commit 8720d412bd)
 2025-02-04 09:54:08 +00:00
Rohit Waghchaure
87405f0753 fix: issue in returning components against the SCO 
(cherry picked from commit 729ce1dc50)
 2025-01-07 13:02:09 +00:00
Mihir Kandoi
b3b808335f fix: Fixed logic in if condition causing tests to fail 
(cherry picked from commit 575fb43f9c)
 2025-01-01 11:06:27 +00:00
Mihir Kandoi
66544bfa10 fix: Added patch and fallback code to prevent future issues similiar to helpdesk ticket 28246 
(cherry picked from commit 65dc3505c4)

# Conflicts:
#	erpnext/patches.txt
 2025-01-01 11:06:27 +00:00
mergify[bot]
8f811728d9 feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (backport #44711) (#44782) 
* 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>
 2024-12-20 12:18:01 +05:30
Nabin Hait
9ac87bd3b1 fix: rounding issue of required qty in subcontracting order (#43908) 
* fix: rounding issue of required qty in subcontracting order

* fix: uom issue in test case

* fix: test case

* fix: restored report tests for manufacturing
 2024-10-30 11:25:08 +05:30
Ninad Parikh
2205ae8e54 fix: Required Changes to Support e-Waybill Generation for Material Transfer Return (#43061) 
(cherry picked from commit 004c4e21d4)
 2024-10-22 13:59:31 +00:00
mergify[bot]
9e109acec7 fix: allow to change the batch in the subcontracting receipt (backport #43584) (#43588) 
fix: allow to change the batch in the subcontracting receipt (#43584)

(cherry picked from commit fc67867a60)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-09 13:43:02 +05:30
mergify[bot]
076bf17439 fix: incoming rate zero for supplied items in returned SCR (backport #42314) (#42315) 
fix: incoming rate zero for supplied items in returned SCR (#42314)

(cherry picked from commit 61daa318fe)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-15 13:28:06 +05:30
Sagar Vora
b59c91a341 perf: dont run queries unnecessarily, improved filters (#41993) 
* perf: dont run queries unnecessarily, improved filters

* perf: dont run query if `in` filter is empty

(cherry picked from commit ac6d85aed6)
 2024-06-22 15:58:00 +00:00
mergify[bot]
17ea958170 fix: SCR batch qty issue (backport #41595) (#41599) 
fix: SCR batch qty issue (#41595)

(cherry picked from commit 418439b58f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-23 16:30:30 +05:30
mergify[bot]
93242ca883 fix: validate uom is integer for PR item (backport #41074) (#41077) 
fix: validate uom is integer for PR item

(cherry picked from commit 9a290fdfc9)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-18 07:53:20 +05:30
mergify[bot]
1ae447e4fc fix: do not add qty to supplied items (backport #41061) (#41066) 
fix: do not add qty to supplied items

(cherry picked from commit 8233c392fb)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-17 17:30:43 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Rohit Waghchaure
9ec24bcc6c fix: use serial/batch fields for subcontracting receipt and in transit stock entry 
(cherry picked from commit 3423334e4f)
 2024-03-24 10:34:52 +00:00
mergify[bot]
7ca72423b9 fix: use serial/batch field for rejected items (backport #40327) (#40329) 
fix: use serial/batch field for rejected items (#40327)

(cherry picked from commit 01856a6e9d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-07 14:36:59 +05:30
Rohit Waghchaure
37329469c3 fix: not able to make purchase receipt 
(cherry picked from commit 2fb0499923)
 2024-02-15 12:04:49 +00:00
mergify[bot]
960443d268 fix: not able to submit subcontracting pr (old flow) (backport #39622) (#39625) 
fix: not able to submit subcontracting pr (old flow) (#39622)

(cherry picked from commit 5cf47ae5f9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-29 21:22:21 +05:30
mergify[bot]
63eef680d0 fix: not able to save subcontracting purchase receipt (old flow) (backport #39590) (#39592) 
fix: not able to save subcontracting purchase receipt (old flow) (#39590)

(cherry picked from commit 67d828dab3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-27 12:15:11 +05:30
mergify[bot]
c797c533ed fix: validation error has not throw for the batch (backport #38494) (#38502) 
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 5e9016ffab)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-01 21:46:35 +05:30
Rohit Waghchaure
abe3e41a17 fix: incorrect requested quantity for the subcontracting order 
(cherry picked from commit 691e3bb24f)
 2023-11-30 13:39:06 +00:00
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 3e77c0b564)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-14 21:15:44 +05:30
mergify[bot]
d558ba29fa fix: serial number decimal issue (backport #37242) (#37250) 
fix: serial number decimal issue (#37242)

(cherry picked from commit 78ab2013e5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-26 17:55:16 +05:30
s-aga-r
afd7d59c73 fix: AttributeError while saving subcontracting order 2023-08-26 13:10:47 +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
a33b75f2cd feat: allow manually entry for scrap items in SCR 2023-08-24 16:37:57 +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
s-aga-r
2a60884abc fix: reduce return qty while calculating transferred qty 2023-06-29 18:59:18 +05:30
Rohit Waghchaure
e88c5d6d90 fix: travis for subcontracting module 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
d3ceb07936 fix: travis 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
467046436b refactor: serial no ledger and batchwise balance history report 2023-06-02 17:14:16 +05:30
Rohit Waghchaure
5bb3173676 refactor: rename doctype serial and batch ledger to serial and batch entry 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
16f26fb3d8 refactor: serial and batch package creation for finished item and cleanup code 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
674bd3e2e5 feat: serial and batch bundle for Packing Items 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
5ddd55a8ae feat: serial and batch bundle for Subcontracting 2023-06-02 17:14:14 +05:30
Sagar Sharma
57ee473fa4 fix: don't recalculate rate for SCR rejected warehouse SLE 2023-05-22 15:07:39 +05:30
Sagar Sharma
d6433f803b refactor(minor): rename function to be more descriptive 2023-05-12 11:45:33 +05:30
Sagar Sharma
867d898304 fix: zero rm-cost for batch rm item in SCR (#34616) 
fix: `0` rm-cost for batch rm item in SCR
 2023-03-28 18:45:16 +05:30
Rohit Waghchaure
156e45970a fix: incorrect consumed qty in subcontracting receipt 2023-02-16 14:17:27 +05:30
s-aga-r
b26e96cdf4 chore: linter 2023-01-12 13:41:53 +05:30
s-aga-r
6878f40d1d chore: add row-index in error msgs 2023-01-12 12:02:00 +05:30
s-aga-r
751bdc98ed fix: set supplier details while mapping SE(Send to Subcontractor) 2023-01-03 17:17:23 +05:30
s-aga-r
01f56c621c Revert "fix: get consumed_qty based on received_qty in SCR" 
This reverts commit 70c9b8dc50.
 2022-11-15 14:32:16 +05:30
Sagar Sharma
70c9b8dc50 fix: get consumed_qty based on received_qty in SCR 2022-11-06 13:33:47 +05:30
Sagar Sharma
760c26e9c0 fix: make BOM required in SCR Item 2022-11-05 15:52:14 +05:30
Sagar Sharma
fa2290657a fix: add validation for non-stock item in SCR 2022-09-30 16:18:15 +05:30
Sagar Sharma
ac7409bbf3 fix: supplied items added twice in Stock Entry 2022-09-28 16:46:48 +05:30