nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-21 10:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,452 Commits 605 Branches 1,802 Tags
ef3d352a17cdd2f5bf883e940d1dfa6a3270f486
Commit Graph

60 Commits

Author SHA1 Message Date
s-aga-r
7c4f83ed60 fix: add item-code filter for SCR supplied-items batch-no 
(cherry picked from commit e91abbfbe3)
 2023-04-19 13:54:00 +00:00
s-aga-r
99226d3811 fix: Subcontracting Receipt incorrect status 
(cherry picked from commit a55b818119)
 2023-04-06 08:27:32 +00:00
Rohit Waghchaure
7eccf431fd fix: consumed qty validation for subcontracting receipt 
(cherry picked from commit b38fe24090)
 2023-03-01 09:46:22 +00:00
Rohit Waghchaure
d5f6a5d193 fix: incorrect consumed qty in subcontracting receipt 
(cherry picked from commit 156e45970a)
 2023-02-16 09:41:06 +00:00
s-aga-r
72e17e3267 chore: copy item_code to Batch while creating new batch from SCR 
(cherry picked from commit ffa9c6e4d9)
 2023-02-15 16:10:57 +00:00
s-aga-r
5f6979d444 chore: add Cancelled status in SCO get_indicator 
(cherry picked from commit 840f9d8987)
 2023-01-24 12:05:08 +00:00
Rohit Waghchaure
ed1aed22c0 fix: not able to change default BOM in the Subcontracting Order 
(cherry picked from commit 11b2994fe8)
 2023-01-21 06:35:40 +00:00
Rohit Waghchaure
21cf929c7a fix: local variable 'stock_rbnb' referenced before assignment 
(cherry picked from commit 1de4742ffb)
 2023-01-18 11:07:42 +00:00
s-aga-r
2dfbc6e4eb fix: zero rm-cost in SCR 
(cherry picked from commit f70d757b82)
 2023-01-14 17:41:46 +00:00
mergify[bot]
120dca44ad chore: subcontracting validations (backport #33621) (#33626) 
* fix: `ZeroDivisionError: float division by zero` in SCR

(cherry picked from commit 434aa594d5)

* chore: add row-index in error msgs

(cherry picked from commit 6878f40d1d)

* chore: update error msgs for Subcontracted PO

(cherry picked from commit a0e2a93f3f)

* fix: validate accepted and rejected qty in SCR Item

(cherry picked from commit f028bd6e69)

* chore: linter

(cherry picked from commit b26e96cdf4)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-01-12 20:31:24 +05:30
s-aga-r
71d6f2a490 fix: hide reject-fields in return SCR 
(cherry picked from commit 7dd7617ec7)
 2022-11-18 09:31:11 +00:00
s-aga-r
f10cceb261 test: fix test cases for supplied-items consumed_qty 
(cherry picked from commit 369db4eacc)
 2022-11-15 09:48:02 +00:00
s-aga-r
0ecb44d40c Revert "fix: set received_qty before_validate SCR" 
This reverts commit c447dfaa9c.

(cherry picked from commit 3706a9b4dc)
 2022-11-15 09:48:02 +00:00
Sagar Sharma
02bb523210 chore: link SCR Return in SCR Dashboard 
(cherry picked from commit 47248251e2)
 2022-11-08 16:07:34 +00:00
Sagar Sharma
af60c8f759 fix: linter 
(cherry picked from commit 5e8a22be24)
 2022-11-07 23:05:58 +05:30
Sagar Sharma
2c5a8c43f6 fix: make consumed_qty editable when backflush based on Material Transfer 
(cherry picked from commit bf4b012cec)
 2022-11-07 17:29:45 +00:00
Sagar Sharma
68229f06d1 fix: make consumed_qty read-only in SCR Supplied Items 
(cherry picked from commit f8d2e276a5)
 2022-11-07 17:29:45 +00:00
Sagar Sharma
8f78be8525 test: add test case for consumed-qty 
(cherry picked from commit 4d8da4420e)
 2022-11-06 10:48:35 +00:00
Sagar Sharma
e316558286 fix: set received_qty before_validate SCR 
(cherry picked from commit c447dfaa9c)
 2022-11-06 10:48:34 +00:00
Sagar Sharma
0856e65700 test: fix test case 
(cherry picked from commit 324bfa9fde)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
3f79a057e4 fix: make BOM required in SCR Item 
(cherry picked from commit 760c26e9c0)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
bd7435ce1e test: add test case 
(cherry picked from commit 761e9df1bf)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
97445d9516 fix: rename test method 
(cherry picked from commit 611d827e0b)
 2022-11-05 11:53:49 +00:00
Sagar Sharma
ff210c73eb fix: po_detail or sco_rm_detail not getting set while while mapping SE 
(cherry picked from commit 3a9c08e7c9)
 2022-09-19 13:49:43 +00:00
Sagar Sharma
62741bf744 test: add test case for returned-qty 
(cherry picked from commit aea7188304)
 2022-09-08 13:31:38 +00:00
mergify[bot]
7840fed7a5 fix: hide "Return of Components" button in closed SCO (backport #32130) (#32131) 
fix: hide "Return of Components" button in closed SCO (#32130)

(cherry picked from commit 3585daab95)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-09-08 18:25:27 +05:30
Sagar Sharma
f2ab220ce3 fix: Subcontracting Receipt GL Entries (backport #31918) (#32124) 
fix: Subcontracting Receipt GL Entries
 2022-09-08 11:18:00 +05:30
Sagar Sharma
121ec83562 refactor(test): test_update_reserved_qty_for_subcontracting 
(cherry picked from commit a349b58306)
 2022-09-05 08:50:29 +00:00
Sagar Sharma
26536da74b fix: validate available qty for consumption in SCR 
(cherry picked from commit 4a7add2169)
 2022-09-05 08:50:28 +00:00
mergify[bot]
cee867f941 fix: AD not getting copied from SCO while creating a SE (backport #32004) (#32007) 
fix: AD not getting copied from SCO while creating a SE (#32004)

(cherry picked from commit 9dbaaa33f5)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-29 15:50:22 +05:30
mergify[bot]
f407c972d1 chore: allow return of components in SCO (backport #31994) (#31995) 
chore: allow return of components in SCO (#31994)

chore: allow return of components in sco
(cherry picked from commit af5cbc881f)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-26 23:15:20 +05:30
mergify[bot]
0bfb774bdf fix: don't allow to create SCR directly (backport #31924) (#31926) 
fix: don't allow to create SCR directly (#31924)

(cherry picked from commit bf5c43322a)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-22 18:38:21 +05:30
mergify[bot]
6be77d5729 fix: make rate field read-only in subcontracting receipt item (backport #31905) (#31906) 
fix: make rate field read-only in subcontracting receipt item (#31905)

(cherry picked from commit 588ca68171)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-20 19:28:21 +05:30
Sagar Sharma
0db912998a chore: allow subcontracting receipt backdated entry 
(cherry picked from commit f8c11847bb)
 2022-08-19 16:31:53 +00:00
Sagar Sharma
376293326b chore: conflicts 2022-08-19 15:30:50 +05:30
Sagar Sharma
e099e10c8e fix: test "test_pending_and_received_qty" 
(cherry picked from commit addd7347d8)
 2022-08-19 09:56:52 +00:00
Sagar Sharma
3b222339b8 chore: add additional-cost table in SCR 
(cherry picked from commit 256b4245d5)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 2022-08-19 09:56:51 +00:00
Sagar Sharma
9e60dd32e8 fix: recalculate rate of items based on "Recalculate Rate" checkbox 
(cherry picked from commit 2fc6833684)
 2022-08-19 09:56:51 +00:00
Sagar Sharma
7ff5414571 chore: move "set_missing_values_in_additional_costs" from SCO to SC" 
(cherry picked from commit ea82fe5bc2)
 2022-08-19 09:56:50 +00:00
Sagar Sharma
d48487ada2 fix: base_amount and exchange_rate in additional-cost table 
(cherry picked from commit eabd3135f0)
 2022-08-19 09:56:50 +00:00
Sagar Sharma
da69cc5477 fix: additional-cost in items table 
(cherry picked from commit d7ed4093d8)
 2022-08-19 09:56:50 +00:00
mergify[bot]
ae5c05081d chore: remove unwanted field "provisional_expense_account" from SCR (backport #31847) (#31886) 
chore: remove unwanted field "provisional_expense_account" from SCR (#31847)

(cherry picked from commit 7e88eb549f)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-18 17:41:01 +05:30
mergify[bot]
50ad612453 fix: Add dimension section in subcontracting doctypes (backport #31849) (#31877) 
* fix: Add dimension section in subcontracting doctypes (#31849)

(cherry picked from commit 8704ca783d)

# Conflicts:
#	erpnext/patches.txt

* chore: conflicts

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-18 12:04:07 +05:30
mergify[bot]
aa5aaa113e fix: Make expense account editable in Subcontracting Receipt Item (backport #31848) (#31870) 
fix: Make expense account editable in Subcontracting Receipt Item (#31848)

(cherry picked from commit 2d04e71412)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-17 16:31:18 +05:30
Sagar Sharma
a7161d3875 fix: SCO status on SCR cancel 2022-07-05 09:27:56 +05:30
Sagar Sharma
caeaa3f940 fix: multiple SCO against a PO 2022-07-02 06:20:09 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
Sagar Sharma
213113bc00 Merge branch 'develop' into subcontracting 2022-05-20 12:13:13 +05:30
Sagar Sharma
e9b28452e4 feat: SCR return 2022-05-20 10:45:34 +05:30
Sagar Sharma
785d598762 test: SubcontractingReceipt 2022-05-20 10:45:33 +05:30