From 6d14cb0c6bcab121be4e560d8f99dc66da088f85 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 1 Feb 2026 16:30:59 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_entry/stock_entry.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 80571a1d813..d7158bf1680 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -246,10 +246,6 @@ class StockEntry(StockController): self.validate_same_source_target_warehouse_during_material_transfer() self.validate_raw_materials_exists() -<<<<<<< HEAD -======= - super().validate_subcontracting_inward() - def validate_repack_entry(self): if self.purpose != "Repack": return @@ -264,7 +260,6 @@ class StockEntry(StockController): title=_("Set Basic Rate Manually"), ) ->>>>>>> 6423ce2fa7 (fix: validation when more than one FG items in repack stock entry) def validate_raw_materials_exists(self): if self.purpose not in ["Manufacture", "Repack", "Disassemble"]: return