From 12bf31df87c9b09f7c1acf31102705faebf125b1 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 6 Mar 2025 13:11:31 +0530 Subject: [PATCH] fix: check if set_landed_cost_based_on_purchase_invoice_rate is enabled before running patch (cherry picked from commit 95d197693151610bda2926db46f70e1cf9f6838c) # Conflicts: # erpnext/patches/v15_0/recalculate_amount_difference_field.py (cherry picked from commit 7047fe26812fbb48d80e3a24f438a9c1c5d8683f) --- .../patches/v15_0/recalculate_amount_difference_field.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/patches/v15_0/recalculate_amount_difference_field.py b/erpnext/patches/v15_0/recalculate_amount_difference_field.py index dda92ecf1e8..d0a42e7cc5e 100644 --- a/erpnext/patches/v15_0/recalculate_amount_difference_field.py +++ b/erpnext/patches/v15_0/recalculate_amount_difference_field.py @@ -7,6 +7,7 @@ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import adjust_incom def execute(): +<<<<<<< HEAD <<<<<<< HEAD table = frappe.qb.DocType("Purchase Receipt Item") parent = frappe.qb.DocType("Purchase Receipt") @@ -52,6 +53,11 @@ def execute(): adjusted_amt * flt(item.conversion_rate), precision, ======= +======= + if not frappe.db.get_single_value("Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate"): + return + +>>>>>>> 95d1976931 (fix: check if set_landed_cost_based_on_purchase_invoice_rate is enabled before running patch) for company in frappe.get_all("Company", pluck="name"): table = frappe.qb.DocType("Purchase Receipt Item") parent = frappe.qb.DocType("Purchase Receipt")