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

chore: conflicts

Browse Source
This commit is contained in:
Sagar Sharma
2022-07-11 17:09:30 +05:30
parent fecf567e92
commit b17850ac3e
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/bom/test_bom.py
View File

@@ -501,7 +501,6 @@ class TestBOM(FrappeTestCase):
bom.submit() bom.submit()
self.assertEqual(bom.items[0].rate, 42) self.assertEqual(bom.items[0].rate, 42)
<<<<<<< HEAD
def test_exclude_exploded_items_from_bom(self): def test_exclude_exploded_items_from_bom(self):
bom_no = get_default_bom() bom_no = get_default_bom()
new_bom = frappe.copy_doc(frappe.get_doc("BOM", bom_no)) new_bom = frappe.copy_doc(frappe.get_doc("BOM", bom_no))
@@ -519,7 +518,7 @@ class TestBOM(FrappeTestCase):
self.assertFalse(row.bom_no) self.assertFalse(row.bom_no)
new_bom.delete() new_bom.delete()
=======
def test_set_default_bom_for_item_having_single_bom(self): def test_set_default_bom_for_item_having_single_bom(self):
from erpnext.stock.doctype.item.test_item import make_item from erpnext.stock.doctype.item.test_item import make_item
@@ -555,7 +554,6 @@ class TestBOM(FrappeTestCase):
bom.save() bom.save()
bom.reload() bom.reload()
self.assertEqual(frappe.get_value("Item", fg_item.item_code, "default_bom"), bom.name) self.assertEqual(frappe.get_value("Item", fg_item.item_code, "default_bom"), bom.name)
>>>>>>> dc2830da4d (fix: set default_bom for item)
def get_default_bom(item_code="_Test FG Item 2"): def get_default_bom(item_code="_Test FG Item 2"):