From 46f3ab1c39be37930a2c7561eeba4ab807872c26 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 3 Jan 2026 15:23:29 +0530 Subject: [PATCH] chore: fix conflicts Removed unused on_discard method and cleaned up code. --- .../doctype/repost_item_valuation/repost_item_valuation.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py index 96660288eff..e3b1b330fad 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py @@ -69,15 +69,9 @@ class RepostItemValuation(Document): ), ) -<<<<<<< HEAD -======= - def on_discard(self): - self.db_set("status", "Cancelled") - def repost_now(self): repost(self) ->>>>>>> cccd34b06a (fix: not able to submit backdated stock reco) def validate(self): self.set_company() self.validate_period_closing_voucher()