nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-06 15:46:07 +05:30
committed by Rohit Waghchaure
parent 7d871f6bb5
commit 4889950a9e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2119,10 +2119,8 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
self.assertRaises(frappe.ValidationError, so1.update_status, "Draft") 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): 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_company(company_name="Glass Ceiling", abbr="GC")
self.create_item("Lamy Safari 2", True, self.warehouse_stores, self.company, 2000) self.create_item("Lamy Safari 2", True, self.warehouse_stores, self.company, 2000)
self.create_customer() self.create_customer()
@@ -2235,7 +2233,6 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
sre_doc.reload() sre_doc.reload()
self.assertTrue(sre_doc.status == "Delivered") 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): def automatically_fetch_payment_terms(enable=1):
accounts_settings = frappe.get_doc("Accounts Settings") accounts_settings = frappe.get_doc("Accounts Settings")