From e3ba4320d6eb1752795dc6f02ddc2e4bc3a5df35 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 14 Jul 2025 17:19:40 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/stock/doctype/material_request/material_request.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index c73da1f4a5d..c37a783ca4d 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -153,15 +153,8 @@ class MaterialRequest(BuyingController): self.reset_default_field_value("set_warehouse", "items", "warehouse") self.reset_default_field_value("set_from_warehouse", "items", "from_warehouse") -<<<<<<< HEAD - if not self.price_list: - self.price_list = frappe.defaults.get_defaults().buying_price_list -======= - self.validate_pp_qty() - if not self.buying_price_list: self.buying_price_list = frappe.defaults.get_defaults().buying_price_list ->>>>>>> adb9a6bc15 (fix: field name of price_list in material request) def before_update_after_submit(self): self.validate_schedule_date()