From c06e241fbc1b555300fcc2a76a79bc5250202956 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 9 Sep 2022 12:40:57 +0530 Subject: [PATCH] fix: Rate for internal PI have non stock UOM items (cherry picked from commit 0f655e4430108ddb8d2bb8b2d35c26ab6fe376dc) # Conflicts: # erpnext/controllers/buying_controller.py --- erpnext/controllers/buying_controller.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index c0f37455a08..7baefd3775b 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -308,7 +308,16 @@ class BuyingController(SubcontractingController): 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: