nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: auto create PR on SCR submission (backport #38290) (#38428)

Browse Source 
* feat: add field `Action on Purchase Order Submission`

(cherry picked from commit 628ea42b63)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: auto create SCO on PO submission

(cherry picked from commit 9ec6f1e1d6)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: add field `Action on Subcontracting Receipt Submission`

(cherry picked from commit 762906f240)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* chore: notify user on SCO creation

(cherry picked from commit 745e3bfb73)

* feat: add field `Purchase Order Item` in SCO Service Item

(cherry picked from commit 45d5cff47d)

* fix: hold PO item ref in SCO Service Item

(cherry picked from commit 7e4dd33ab0)

* feat: add field `Purchase Order Item` in SCO Item

(cherry picked from commit a2ede7d6d5)

* fix: maintain PO and PO Item ref in SCR Item

(cherry picked from commit e1cea25781)

* feat: auto create PR on SCR submission

(cherry picked from commit 040cc8d22f)

* feat: add `Purchase Order` link in SCR connections

(cherry picked from commit ca8a5b45ba)

* feat: add `Subcontracting Receipt` link in PO connections

(cherry picked from commit 98cba5ed30)

* fix: dont show `View` button on cancelled SCR

(cherry picked from commit dd80d3b9b9)

* fix: use checkbox instead of select field

(cherry picked from commit d366a91d9e)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* feat: Subcontracting Receipt ref in Purchase Receipt

(cherry picked from commit d891bd7fac)

* feat: SCR Item ref in PR Item

(cherry picked from commit 37b3ac7952)

* feat: provision to create PR from SCR

(cherry picked from commit 8052103197)

* chore: PR ref in SCR connections

(cherry picked from commit 096a2c8cd0)

* fix: map warehouses in return SCR

(cherry picked from commit 874766a82f)

* fix(ux): hide `Create Purchase Receipt` button for Subcontract Return

(cherry picked from commit 7145b040f1)

* chore: `linter`

(cherry picked from commit 857f2b5a01)

* test: auto create SCO on PO submit

(cherry picked from commit 68585f6f2b)

* test: auto create PR on SCR submit

(cherry picked from commit 7b0cd03f88)

* fix(test): `test_auto_create_purchase_receipt`

(cherry picked from commit 3da0aa6a0b)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
This commit is contained in:
mergify[bot]
2023-11-30 12:11:05 +05:30
committed by GitHub
parent 277e81c68e
commit 7005d51af3
16 changed files with 531 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -391,7 +391,10 @@ def make_return_doc(
if doc.get("discount_amount"):
doc.discount_amount = -1 * source.discount_amount
if doctype != "Subcontracting Receipt":
if doctype == "Subcontracting Receipt":
doc.set_warehouse = source.set_warehouse
doc.supplier_warehouse = source.supplier_warehouse
else:
doc.run_method("calculate_taxes_and_totals")
def update_item(source_doc, target_doc, source_parent):