schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,085 Commits 322 Branches 1,581 Tags
497049b3fd7139c59b0f117ddaea9fbd2df98e18
Commit Graph

23 Commits

Author SHA1 Message Date
mergify[bot]
497049b3fd fix: incorrect requested quantity for the subcontracting order (backport #38455) (#38471) 
* fix: incorrect requested quantity for the subcontracting order

(cherry picked from commit 691e3bb24f)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-11-30 20:53:52 +05:30
rohitwaghchaure
78ab2013e5 fix: serial number decimal issue (#37242) 2023-09-26 16:46:19 +05:30
mergify[bot]
bdfbccd38e fix: get incoming rate instead of BOM rate (backport #36496) (#36506) 
* 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

(cherry picked from commit 758b31d895)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-08-06 14:51:23 +05:30
mergify[bot]
6f50ad685e feat: allow the partial return of components against SCO (backport #35935) (#35938) 
* fix: don't update SCO status to closed until full return

(cherry picked from commit 2f6d56dd62)

* fix: reduce return qty while calculating transferred qty

(cherry picked from commit 2a60884abc)

# Conflicts:
#	erpnext/controllers/subcontracting_controller.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-06-29 22:16:53 +05:30
Sagar Sharma
633a1703dc fix: don't recalculate rate for SCR rejected warehouse SLE 
(cherry picked from commit 57ee473fa4)
 2023-05-22 10:16:09 +00:00
Sagar Sharma
0575b105d0 refactor(minor): rename function to be more descriptive 
(cherry picked from commit d6433f803b)
 2023-05-15 10:56:51 +00:00
mergify[bot]
cff35d7286 fix: zero rm-cost for batch rm item in SCR (backport #34616) (#34623) 
fix: zero rm-cost for batch rm item in SCR (#34616)

fix: `0` rm-cost for batch rm item in SCR
(cherry picked from commit 867d898304)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-03-28 21:09:01 +05:30
Rohit Waghchaure
d5f6a5d193 fix: incorrect consumed qty in subcontracting receipt 
(cherry picked from commit 156e45970a)
 2023-02-16 09:41:06 +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
06e13b64a4 fix: set supplier details while mapping SE(Send to Subcontractor) 
(cherry picked from commit 751bdc98ed)
 2023-01-03 13:27:55 +00:00
s-aga-r
7fd6c43752 Revert "fix: get consumed_qty based on received_qty in SCR" 
This reverts commit 70c9b8dc50.

(cherry picked from commit 01f56c621c)
 2022-11-15 09:48:02 +00:00
Sagar Sharma
ea9a50278d fix: get consumed_qty based on received_qty in SCR 
(cherry picked from commit 70c9b8dc50)
 2022-11-06 10:48:34 +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
793fa18225 fix: add validation for non-stock item in SCR 
(cherry picked from commit fa2290657a)
 2022-09-30 11:23:50 +00:00
Sagar Sharma
d91ac5e549 fix: supplied items added twice in Stock Entry 
(cherry picked from commit ac7409bbf3)
 2022-09-28 12:20:55 +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
4568648d8c fix: SCO Supplied Items returned-qty 
(cherry picked from commit ccb2889cac)
 2022-09-08 13:31:38 +00:00
Sagar Sharma
09d8fa4b5d fix: AD not getting copied from SCO while creating a Material Transfer (#32109) 
fix: AD not getting copied from SCO while creating a Material Transfer (#32106)
 2022-09-07 12:42:12 +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
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
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
Sagar Sharma
249726b845 feat: New DocType "Subcontracting Order" 2022-05-20 10:45:33 +05:30
Sagar Sharma
29a1cb89c2 feat: SubcontractingController 2022-05-20 10:45:33 +05:30