From 5557e982bf68d755865ba1af2718e6ff88ce1775 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 21 May 2026 14:30:26 +0530 Subject: [PATCH] chore: fix conflicts Removed legacy fields related to incoming rate and parallel reposting. --- .../stock_reposting_settings/stock_reposting_settings.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py index 8b905c481d4..c2b3d81c5c7 100644 --- a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py +++ b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py @@ -16,12 +16,7 @@ class StockRepostingSettings(Document): if TYPE_CHECKING: from frappe.types import DF -<<<<<<< HEAD -======= do_not_fetch_incoming_rate_from_serial_no: DF.Check - enable_parallel_reposting: DF.Check - enable_separate_reposting_for_gl: DF.Check ->>>>>>> 2773b7c002 (fix: incoming rate for legacy serial no) end_time: DF.Time | None item_based_reposting: DF.Check limit_reposting_timeslot: DF.Check