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

chore: fix conflicts

Browse Source 
Removed redundant on_update method and cleaned up code.
This commit is contained in:
rohitwaghchaure
2026-03-02 14:35:45 +05:30
committed by GitHub
parent d5e25153f8
commit 9d73faddfe
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/stock_controller.py
View File

@@ -67,12 +67,6 @@ class StockController(AccountsController):
self.validate_putaway_capacity() self.validate_putaway_capacity()
self.reset_conversion_factor() self.reset_conversion_factor()
<<<<<<< HEAD
=======
def on_update(self):
super().on_update()
self.check_zero_rate()
def validate_warehouse_of_sabb(self): def validate_warehouse_of_sabb(self):
if self.is_internal_transfer(): if self.is_internal_transfer():
return return
@@ -112,7 +106,6 @@ class StockController(AccountsController):
sabb_doc = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle) sabb_doc = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
sabb_doc.validate_serial_no_status() sabb_doc.validate_serial_no_status()
>>>>>>> 9b8f685c82 (fix: validate warehouse of SABB for draft entry)
def reset_conversion_factor(self): def reset_conversion_factor(self):
for row in self.get("items"): for row in self.get("items"):
if row.uom != row.stock_uom: if row.uom != row.stock_uom: