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

Merge pull request #32147 from frappe/mergify/bp/version-14-hotfix/pr-32145

Browse Source 
fix: validate Subcontracting Order Status in Stock Entry (backport #32145)
This commit is contained in:
Sagar Sharma
2022-09-09 17:06:28 +05:30
committed by GitHub
parent 8be12f0858 d3cc9d4fa6
commit 61a1b2b42b
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -815,7 +815,8 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
return { return {
"filters": { "filters": {
"docstatus": 1, "docstatus": 1,
"company": me.frm.doc.company "company": me.frm.doc.company,
"status": ["not in", ["Completed", "Closed"]]
} }
}; };
}); });

15
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -117,6 +117,7 @@ class StockEntry(StockController):
self.validate_work_order() self.validate_work_order()
self.validate_bom() self.validate_bom()
self.validate_purchase_order() self.validate_purchase_order()
self.validate_subcontracting_order()
if self.purpose in ("Manufacture", "Repack"): if self.purpose in ("Manufacture", "Repack"):
self.mark_finished_and_scrap_items() self.mark_finished_and_scrap_items()
@@ -959,6 +960,20 @@ class StockEntry(StockController):
) )
) )
def validate_subcontracting_order(self):
if self.get("subcontracting_order") and self.purpose in [
"Send to Subcontractor",
"Material Transfer",
]:
sco_status = frappe.db.get_value("Subcontracting Order", self.subcontracting_order, "status")
if sco_status == "Closed":
frappe.throw(
_("Cannot create Stock Entry against a closed Subcontracting Order {0}.").format(
self.subcontracting_order
)
)
def mark_finished_and_scrap_items(self): def mark_finished_and_scrap_items(self):
if any([d.item_code for d in self.items if (d.is_finished_item and d.t_warehouse)]): if any([d.item_code for d in self.items if (d.is_finished_item and d.t_warehouse)]):
return return