From ae010cb948ce441fcc5cf31797be5082b1394ba2 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 13 Sep 2024 17:33:47 +0530 Subject: [PATCH] refactor(test): set valuation rate for stocked item (cherry picked from commit e5b699821f8229d937a77617e94f238ebed359df) --- erpnext/accounts/test/accounts_mixin.py | 10 ++++++++-- .../selling/doctype/sales_order/test_sales_order.py | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/test/accounts_mixin.py b/erpnext/accounts/test/accounts_mixin.py index e526e07c734..f2550f738e2 100644 --- a/erpnext/accounts/test/accounts_mixin.py +++ b/erpnext/accounts/test/accounts_mixin.py @@ -32,8 +32,14 @@ class AccountsTestMixin: else: self.supplier = supplier_name - def create_item(self, item_name="_Test Item", is_stock=0, warehouse=None, company=None): - item = create_item(item_name, is_stock_item=is_stock, warehouse=warehouse, company=company) + def create_item(self, item_name="_Test Item", is_stock=0, warehouse=None, company=None, valuation_rate=0): + item = create_item( + item_name, + is_stock_item=is_stock, + warehouse=warehouse, + company=company, + valuation_rate=valuation_rate, + ) self.item = item.name def create_company(self, company_name="_Test Company", abbr="_TC"): diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 1c3c5b4decc..db28f8d5fe6 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -55,6 +55,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): self.create_customer("_Test Customer Credit") def tearDown(self): + frappe.db.rollback() frappe.set_user("Administrator") def test_sales_order_with_negative_rate(self): @@ -2122,7 +2123,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): @change_settings("Stock Settings", {"enable_stock_reservation": True}) def test_warehouse_mapping_based_on_stock_reservation(self): self.create_company(company_name="Glass Ceiling", abbr="GC") - self.create_item("Lamy Safari", True, self.warehouse_stores, self.company) + self.create_item("Lamy Safari 2", True, self.warehouse_stores, self.company, 2000) self.create_customer() self.clear_old_entries() @@ -2140,7 +2141,6 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): "delivery_date": today(), }, ) - so.save() so.submit() # Create stock @@ -2156,7 +2156,7 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase): ], } ) - se.save().submit() + se.submit() # Reserve stock on 2 different warehouses itm = so.items[0]