From 36e2cf49f359cb59bb52e5ebdaf0327cf446c7b5 Mon Sep 17 00:00:00 2001 From: Kavin <78342682+kavin-114@users.noreply.github.com> Date: Tue, 10 Feb 2026 13:35:52 +0530 Subject: [PATCH] fix: resolve conflicts - Remove POS Settings configuration for version 15 backport. --- erpnext/stock/doctype/batch/test_batch.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/batch/test_batch.py b/erpnext/stock/doctype/batch/test_batch.py index 65a2420693f..2100f2f663f 100644 --- a/erpnext/stock/doctype/batch/test_batch.py +++ b/erpnext/stock/doctype/batch/test_batch.py @@ -141,14 +141,10 @@ class TestBatch(FrappeTestCase): from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import ( create_batch_item_with_batch, ) - - invoice_type = frappe.db.get_single_value("POS Settings", "invoice_type") + session_user = frappe.session.user try: - # Set invoice type to POS Invoice - frappe.db.set_single_value("POS Settings", "invoice_type", "POS Invoice") - # Create batch item create_batch_item_with_batch("_Test BATCH ITEM", "TestBatch-RS 02") @@ -198,8 +194,6 @@ class TestBatch(FrappeTestCase): self.assertEqual(row.qty, 30) finally: - # Set invoice type to Sales Invoice - frappe.db.set_single_value("POS Settings", "invoice_type", invoice_type) # Set user to session user frappe.set_user(session_user)