nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-15 23:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
Rohit Waghchaure
2026-02-01 16:30:59 +05:30
parent fec3a8b511
commit 6d14cb0c6b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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