CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 01:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts

Browse Source 
- Remove POS Settings configuration for version 15 backport.
This commit is contained in:
Kavin
2026-02-10 13:35:52 +05:30
committed by GitHub
parent aedab5c210
commit 36e2cf49f3
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/batch/test_batch.py
View File

@@ -142,13 +142,9 @@ class TestBatch(FrappeTestCase):
create_batch_item_with_batch, create_batch_item_with_batch,
) )
invoice_type = frappe.db.get_single_value("POS Settings", "invoice_type")
session_user = frappe.session.user session_user = frappe.session.user
try: try:
# Set invoice type to POS Invoice
frappe.db.set_single_value("POS Settings", "invoice_type", "POS Invoice")
# Create batch item # Create batch item
create_batch_item_with_batch("_Test BATCH ITEM", "TestBatch-RS 02") create_batch_item_with_batch("_Test BATCH ITEM", "TestBatch-RS 02")
@@ -198,8 +194,6 @@ class TestBatch(FrappeTestCase):
self.assertEqual(row.qty, 30) self.assertEqual(row.qty, 30)
finally: finally:
# Set invoice type to Sales Invoice
frappe.db.set_single_value("POS Settings", "invoice_type", invoice_type)
# Set user to session user # Set user to session user
frappe.set_user(session_user) frappe.set_user(session_user)