From 9efc1de40eb19cfd1e805adac5ccae8f413ebab5 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 2 Jan 2025 10:26:51 +0530 Subject: [PATCH] fix: removed unused code (cherry picked from commit dc5f2d35ac4367e7e7c17e4b16edf57b169d0aba) # Conflicts: # erpnext/stock/doctype/stock_entry/stock_entry.py --- erpnext/stock/doctype/stock_entry/stock_entry.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 2a8bb383a9c..eaf21b373f2 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -113,7 +113,6 @@ class StockEntry(StockController): self.validate_purpose() self.validate_item() self.validate_customer_provided_item() - self.validate_qty() self.set_transfer_qty() self.validate_uom_is_integer("uom", "qty") self.validate_uom_is_integer("stock_uom", "transfer_qty") @@ -375,6 +374,7 @@ class StockEntry(StockController): flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item) ) +<<<<<<< HEAD if ( self.purpose in ("Material Transfer", "Material Transfer for Manufacture") and not item.serial_no @@ -419,6 +419,8 @@ class StockEntry(StockController): if stock_qty > trans_qty: item_code.append(item.item_code) +======= +>>>>>>> dc5f2d35ac (fix: removed unused code) def validate_fg_completed_qty(self): if self.purpose != "Manufacture": return