From 4889950a9e6ec2007be655ed5037c884ca370d68 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 6 Feb 2025 15:46:07 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/selling/doctype/sales_order/test_sales_order.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index e4fc1b6fe53..99912147cad 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -2119,10 +2119,8 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): self.assertRaises(frappe.ValidationError, so1.update_status, "Draft") -<<<<<<< HEAD -======= - @IntegrationTestCase.change_settings("Stock Settings", {"enable_stock_reservation": True}) def test_warehouse_mapping_based_on_stock_reservation(self): + frappe.db.set_single_value("Stock Settings", "enable_stock_reservation", True) self.create_company(company_name="Glass Ceiling", abbr="GC") self.create_item("Lamy Safari 2", True, self.warehouse_stores, self.company, 2000) self.create_customer() @@ -2235,7 +2233,6 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): sre_doc.reload() self.assertTrue(sre_doc.status == "Delivered") ->>>>>>> 0c9d0ea1f4 (fix: stock reservation not working for sales invoice with update stock) def automatically_fetch_payment_terms(enable=1): accounts_settings = frappe.get_doc("Accounts Settings")