nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-07-14 17:19:40 +05:30
committed by GitHub
parent ee6ef03e24
commit e3ba4320d6
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/material_request/material_request.py
View File

@@ -153,15 +153,8 @@ class MaterialRequest(BuyingController):
self.reset_default_field_value("set_warehouse", "items", "warehouse") self.reset_default_field_value("set_warehouse", "items", "warehouse")
self.reset_default_field_value("set_from_warehouse", "items", "from_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: if not self.buying_price_list:
self.buying_price_list = frappe.defaults.get_defaults().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): def before_update_after_submit(self):
self.validate_schedule_date() self.validate_schedule_date()