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

fix: don't allow to submit/cancel SE against a closed SCO

Browse Source
This commit is contained in:
s-aga-r
2024-01-03 22:20:06 +05:30
parent 9e973476b2
commit 5bc2035bd0
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ from frappe.utils import (
import erpnext import erpnext
from erpnext.accounts.general_ledger import process_gl_map from erpnext.accounts.general_ledger import process_gl_map
from erpnext.buying.utils import check_on_hold_or_closed_status
from erpnext.controllers.taxes_and_totals import init_landed_taxes_and_totals from erpnext.controllers.taxes_and_totals import init_landed_taxes_and_totals
from erpnext.manufacturing.doctype.bom.bom import ( from erpnext.manufacturing.doctype.bom.bom import (
add_additional_cost, add_additional_cost,
@@ -208,7 +209,6 @@ class StockEntry(StockController):
self.validate_bom() self.validate_bom()
self.set_process_loss_qty() self.set_process_loss_qty()
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()
@@ -274,6 +274,7 @@ class StockEntry(StockController):
return False return False
def on_submit(self): def on_submit(self):
self.validate_closed_subcontracting_order()
self.update_stock_ledger() self.update_stock_ledger()
self.update_work_order() self.update_work_order()
self.validate_subcontract_order() self.validate_subcontract_order()
@@ -294,6 +295,7 @@ class StockEntry(StockController):
self.set_material_request_transfer_status("Completed") self.set_material_request_transfer_status("Completed")
def on_cancel(self): def on_cancel(self):
self.validate_closed_subcontracting_order()
self.update_subcontract_order_supplied_items() self.update_subcontract_order_supplied_items()
self.update_subcontracting_order_status() self.update_subcontracting_order_status()
@@ -1203,19 +1205,9 @@ class StockEntry(StockController):
) )
) )
def validate_subcontracting_order(self): def validate_closed_subcontracting_order(self):
if self.get("subcontracting_order") and self.purpose in [ if self.get("subcontracting_order"):
"Send to Subcontractor", check_on_hold_or_closed_status("Subcontracting Order", self.subcontracting_order)
"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 self.purpose != "Repack" and any( if self.purpose != "Repack" and any(