From 04a6831645f511edb574b140d0cf91dd0aba972d Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 30 Jun 2026 20:35:44 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/controllers/sales_and_purchase_return.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py index afa4f5c6d00..c58580739e3 100644 --- a/erpnext/controllers/sales_and_purchase_return.py +++ b/erpnext/controllers/sales_and_purchase_return.py @@ -143,11 +143,7 @@ def validate_returned_items(doc): ref.rate and flt(d.rate) > ref.rate and doc.doctype in ("Delivery Note", "Sales Invoice") -<<<<<<< HEAD - and get_valuation_method(ref.item_code) != "Moving Average" -======= - and get_valuation_method(d.item_code, doc.company) != "Moving Average" ->>>>>>> 1492c9fbc3 (fix: use correct variable to fetch valuation method) + and get_valuation_method(d.item_code) != "Moving Average" ): frappe.throw( _("Row # {0}: Rate cannot be greater than the rate used in {1} {2}").format(