From dda057d2577d1140cb9f704dfe6571e6056413fb Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 13 Sep 2022 13:40:36 +0530 Subject: [PATCH] chore: Resolve conflicts --- erpnext/controllers/buying_controller.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index 7baefd3775b..584266d53b1 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -308,16 +308,12 @@ 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: