schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Merge conflict

Browse Source
This commit is contained in:
marination
2021-12-28 14:41:03 +05:30
parent 59aaef3719
commit 00b9f1fbef
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -933,7 +933,6 @@ class TestStockEntry(ERPNextTestCase):
distributed_costs = [d.additional_cost for d in se.items] distributed_costs = [d.additional_cost for d in se.items]
self.assertEqual([40.0, 60.0], distributed_costs) self.assertEqual([40.0, 60.0], distributed_costs)
<<<<<<< HEAD
@change_settings("Stock Settings", {"allow_negative_stock": 0}) @change_settings("Stock Settings", {"allow_negative_stock": 0})
def test_future_negative_sle(self): def test_future_negative_sle(self):
# Initialize item, batch, warehouse, opening qty # Initialize item, batch, warehouse, opening qty
@@ -1010,7 +1009,7 @@ class TestStockEntry(ERPNextTestCase):
batch_no=batch_nos[1], batch_no=batch_nos[1],
posting_date='2021-09-02', # backdated consumption of 2nd batch posting_date='2021-09-02', # backdated consumption of 2nd batch
purpose='Material Issue') purpose='Material Issue')
=======
def test_independent_manufacture_entry(self): def test_independent_manufacture_entry(self):
"Test FG items and incoming rate calculation in Maniufacture Entry without WO or BOM linked." "Test FG items and incoming rate calculation in Maniufacture Entry without WO or BOM linked."
se = frappe.get_doc( se = frappe.get_doc(
@@ -1042,7 +1041,6 @@ class TestStockEntry(ERPNextTestCase):
# teardown # teardown
se.delete() se.delete()
>>>>>>> affb29194b (test: Independent Manufacture Entry)
def make_serialized_item(**args): def make_serialized_item(**args):
args = frappe._dict(args) args = frappe._dict(args)