From b2ea5620b2077422ff46385eba2692773b335f34 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 2 Dec 2025 17:42:18 +0530 Subject: [PATCH] chore: fix conflicts Removed the expense account assignment for subcontracting delivery. --- erpnext/stock/doctype/stock_entry/stock_entry.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 6797c2d4384..e221595061d 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -492,15 +492,9 @@ class StockEntry(StockController): flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item) ) -<<<<<<< HEAD -======= - if self.purpose == "Subcontracting Delivery": - item.expense_account = frappe.get_value("Company", self.company, "default_expense_account") - if self.purpose == "Manufacture": item.set("expense_account", item_details.get("expense_account")) ->>>>>>> ce1312764f (fix(stock entry): use fg item expense account for direct manufacturing entry) def validate_fg_completed_qty(self): item_wise_qty = {} if self.purpose == "Manufacture" and self.work_order: