From b454c3eb28dcd7594029d9806beadf4723503fa8 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 20 May 2026 16:58:01 +0530 Subject: [PATCH] =?UTF-8?q?fix:=20valuation=20rate=20missing=20for=20stand?= =?UTF-8?q?alone=20credit=20notes=20for=20moving=20av=E2=80=A6=20(#55102)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 00057b179888a9744be6a153799f52512f4694ce) # Conflicts: # erpnext/controllers/selling_controller.py --- erpnext/controllers/selling_controller.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index d5bd3501527..67b9aefd1d4 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -561,7 +561,15 @@ class SellingController(StockController): if ( not d.incoming_rate or self.is_internal_transfer() +<<<<<<< HEAD or (get_valuation_method(d.item_code) == "Moving Average" and self.get("is_return")) +======= + or ( + get_valuation_method(d.item_code, self.company) == "Moving Average" + and self.get("is_return") + and not is_standalone + ) +>>>>>>> 00057b1798 (fix: valuation rate missing for standalone credit notes for moving av… (#55102)) ): d.incoming_rate = get_incoming_rate( {