From b17850ac3ea92f524785911d69a0770e13ec8ae8 Mon Sep 17 00:00:00 2001 From: Sagar Sharma Date: Mon, 11 Jul 2022 17:09:30 +0530 Subject: [PATCH] chore: conflicts --- erpnext/manufacturing/doctype/bom/test_bom.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py index cee2972ba3c..edb97937f02 100644 --- a/erpnext/manufacturing/doctype/bom/test_bom.py +++ b/erpnext/manufacturing/doctype/bom/test_bom.py @@ -501,7 +501,6 @@ class TestBOM(FrappeTestCase): bom.submit() self.assertEqual(bom.items[0].rate, 42) -<<<<<<< HEAD def test_exclude_exploded_items_from_bom(self): bom_no = get_default_bom() new_bom = frappe.copy_doc(frappe.get_doc("BOM", bom_no)) @@ -519,7 +518,7 @@ class TestBOM(FrappeTestCase): self.assertFalse(row.bom_no) new_bom.delete() -======= + def test_set_default_bom_for_item_having_single_bom(self): from erpnext.stock.doctype.item.test_item import make_item @@ -555,7 +554,6 @@ class TestBOM(FrappeTestCase): bom.save() bom.reload() 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"):