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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-06-30 20:35:44 +05:30
committed by GitHub
parent c2b7718455
commit 04a6831645
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -143,11 +143,7 @@ def validate_returned_items(doc):
ref.rate ref.rate
and flt(d.rate) > ref.rate and flt(d.rate) > ref.rate
and doc.doctype in ("Delivery Note", "Sales Invoice") and doc.doctype in ("Delivery Note", "Sales Invoice")
<<<<<<< HEAD and get_valuation_method(d.item_code) != "Moving Average"
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)
): ):
frappe.throw( frappe.throw(
_("Row # {0}: Rate cannot be greater than the rate used in {1} {2}").format( _("Row # {0}: Rate cannot be greater than the rate used in {1} {2}").format(