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

chore: fix conflicts

Browse Source 
Removed subcontracting order validation methods from stock entry.
This commit is contained in:
rohitwaghchaure
2026-01-24 13:50:33 +05:30
committed by GitHub
parent 650f874fbd
commit a4b099e481
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,15 +243,8 @@ class StockEntry(StockController):
self.reset_default_field_value("to_warehouse", "items", "t_warehouse") self.reset_default_field_value("to_warehouse", "items", "t_warehouse")
self.validate_same_source_target_warehouse_during_material_transfer() self.validate_same_source_target_warehouse_during_material_transfer()
<<<<<<< HEAD
=======
self.validate_closed_subcontracting_order()
self.validate_subcontract_order()
self.validate_raw_materials_exists() self.validate_raw_materials_exists()
super().validate_subcontracting_inward()
def validate_raw_materials_exists(self): def validate_raw_materials_exists(self):
if self.purpose not in ["Manufacture", "Repack", "Disassemble"]: if self.purpose not in ["Manufacture", "Repack", "Disassemble"]:
return return
@@ -272,7 +265,6 @@ class StockEntry(StockController):
title=_("Raw Materials Missing"), title=_("Raw Materials Missing"),
) )
>>>>>>> f003b3c378 (fix: validation to check at-least one raw material for manufacture entry)
def set_serial_batch_for_disassembly(self): def set_serial_batch_for_disassembly(self):
if self.purpose != "Disassemble": if self.purpose != "Disassemble":
return return