nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-20 03:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: valuation rate missing for standalone credit notes for moving av… (#55102)

Browse Source 
(cherry picked from commit 00057b1798)

# Conflicts:
#	erpnext/controllers/selling_controller.py
This commit is contained in:
Mihir Kandoi
2026-05-20 16:58:01 +05:30
committed by Mergify
parent aa79247c39
commit b454c3eb28
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/selling_controller.py
View File

@@ -561,7 +561,15 @@ class SellingController(StockController):
if ( if (
not d.incoming_rate not d.incoming_rate
or self.is_internal_transfer() 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) == "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( d.incoming_rate = get_incoming_rate(
{ {