nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-17 21:32:48 +05:30
committed by GitHub
parent 697fdf5bc3
commit 43d32eb10e
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
View File

@@ -16,19 +16,7 @@ from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle impor
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
<<<<<<< HEAD
class TestSerialandBatchBundle(FrappeTestCase): class TestSerialandBatchBundle(FrappeTestCase):
=======
class UnitTestSerialAndBatchBundle(UnitTestCase):
"""
Unit tests for SerialAndBatchBundle.
Use this class for testing individual functions and methods.
"""
pass
class TestSerialandBatchBundle(IntegrationTestCase):
def test_naming_for_sabb(self): def test_naming_for_sabb(self):
frappe.db.set_single_value( frappe.db.set_single_value(
"Stock Settings", "set_serial_and_batch_bundle_naming_based_on_naming_series", 1 "Stock Settings", "set_serial_and_batch_bundle_naming_based_on_naming_series", 1
@@ -90,7 +78,6 @@ class TestSerialandBatchBundle(IntegrationTestCase):
self.assertFalse(bundle_doc.name.startswith("SABB-")) self.assertFalse(bundle_doc.name.startswith("SABB-"))
>>>>>>> fe43975cdd (fix: provision to enable naming series for SABB)
def test_inward_outward_serial_valuation(self): def test_inward_outward_serial_valuation(self):
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt