nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-13 06:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use stock settings for warehouse defaults

Browse Source
This commit is contained in:
Mihir Kandoi
2026-08-09 13:01:00 +05:30
parent e0d39074be
commit d8bbe865a8
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/buying/doctype/purchase_order/test_purchase_order.py
View File

@@ -302,9 +302,11 @@ class TestPurchaseOrder(ERPNextTestSuite):
po.submit() po.submit()
first_item_of_po = po.get("items")[0] first_item_of_po = po.get("items")[0]
company_default = frappe.db.get_value("Company", po.company, "default_warehouse") stock_settings_default = frappe.db.get_single_value("Stock Settings", "default_warehouse")
frappe.db.set_value("Company", po.company, "default_warehouse", None) frappe.db.set_single_value("Stock Settings", "default_warehouse", None)
self.addCleanup(frappe.db.set_value, "Company", po.company, "default_warehouse", company_default) self.addCleanup(
frappe.db.set_single_value, "Stock Settings", "default_warehouse", stock_settings_default
)
def get_trans_items(item_code): def get_trans_items(item_code):
return json.dumps( return json.dumps(
@@ -517,11 +519,13 @@ class TestPurchaseOrder(ERPNextTestSuite):
"item_code": item, "item_code": item,
"rate": 100, "rate": 100,
"qty": 1, "qty": 1,
"warehouse": po.items[0].warehouse,
}, # added item whose tax account head already exists in PO }, # added item whose tax account head already exists in PO
{ {
"item_code": new_item_with_tax.name, "item_code": new_item_with_tax.name,
"rate": 100, "rate": 100,
"qty": 1, "qty": 1,
"warehouse": po.items[0].warehouse,
}, # added item whose tax account head is missing in PO }, # added item whose tax account head is missing in PO
] ]
) )

2
erpnext/controllers/accounts_controller.py
View File

@@ -3808,7 +3808,7 @@ def get_new_child_item_warehouse(p_doc, item, trans_item: dict, child_doctype: s
if is_warehouse_required_for_new_child_item(child_doctype, item, trans_item): if is_warehouse_required_for_new_child_item(child_doctype, item, trans_item):
frappe.throw( frappe.throw(
_( _(
"Cannot find a default warehouse for item {0}. Please select one in the Update Items dialog, or set a default in the Item Master or in the Company." "Cannot find a default warehouse for item {0}. Please select one in the Update Items dialog, or set a default in the Item Master or in Stock Settings."
).format(frappe.bold(item.item_code)) ).format(frappe.bold(item.item_code))
) )
return None return None

11
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -655,10 +655,11 @@ class TestSalesOrder(ERPNextTestSuite):
so = make_sales_order(item_code="_Test Item", qty=4) so = make_sales_order(item_code="_Test Item", qty=4)
existing_item = so.get("items")[0] existing_item = so.get("items")[0]
# a company gets a default warehouse when its warehouses are created stock_settings_default = frappe.db.get_single_value("Stock Settings", "default_warehouse")
company_default = frappe.db.get_value("Company", so.company, "default_warehouse") frappe.db.set_single_value("Stock Settings", "default_warehouse", None)
frappe.db.set_value("Company", so.company, "default_warehouse", None) self.addCleanup(
self.addCleanup(frappe.db.set_value, "Company", so.company, "default_warehouse", company_default) frappe.db.set_single_value, "Stock Settings", "default_warehouse", stock_settings_default
)
def get_trans_items(warehouse=None): def get_trans_items(warehouse=None):
new_row = {"item_code": item_code, "rate": 200, "qty": 7} new_row = {"item_code": item_code, "rate": 200, "qty": 7}
@@ -677,7 +678,7 @@ class TestSalesOrder(ERPNextTestSuite):
] ]
) )
# no default in the Item Master, Item Group, Brand or Company # no default in the Item Master, Item Group, Brand or Stock Settings
self.assertRaisesRegex( self.assertRaisesRegex(
frappe.ValidationError, frappe.ValidationError,
"Cannot find a default warehouse", "Cannot find a default warehouse",