fix: Rate for internal PI have non stock UOM items

(cherry picked from commit 0f655e4) # Conflicts: # erpnext/controllers/buying_controller.py
frappe · Sep 12, 2022 · c06e241 · c06e241
1 parent a9e9dad
commit c06e241
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
@@ -308,7 +308,16 @@ def set_incoming_rate(self):
 
 					rate = flt(outgoing_rate * (d.conversion_factor or 1), d.precision("rate"))
 				else:
+<<<<<<< HEAD
 					rate = frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), "rate")
+=======
+					field = "incoming_rate" if self.get("is_internal_supplier") else "rate"
+					rate = flt(
+						frappe.db.get_value(ref_doctype, d.get(frappe.scrub(ref_doctype)), field)
+						* (d.conversion_factor or 1),
+						d.precision("rate"),
+					)
+>>>>>>> 0f655e4430 (fix: Rate for internal PI have non stock UOM items)
 
 				if self.is_internal_transfer():
 					if rate != d.rate: