From 6cca7d670ba0a7dc492fae84a345351ea34ffa9a Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 31 Aug 2026 13:40:14 +0530 Subject: [PATCH] fix: restore isolated loyalty and subcontracting tests (#58587) --- .../accounts/doctype/loyalty_program/test_loyalty_program.py | 4 ++-- erpnext/stock/doctype/stock_entry/services/manufacturing.py | 2 ++ .../test_subcontracting_inward_order.py | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py index 323b8eddb62..4ba4d9ae5da 100644 --- a/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py +++ b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py @@ -1,6 +1,6 @@ # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt -import unittest +from unittest.mock import patch import frappe from frappe.query_builder.functions import Sum @@ -196,7 +196,7 @@ class TestLoyaltyProgram(ERPNextTestSuite): for d in company_wise_info: self.assertTrue(d.get("loyalty_points")) - @unittest.mock.patch("erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_details") + @patch("erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_details") def test_tier_selection(self, mock_get_loyalty_details): # Create a new loyalty program with multiple tiers loyalty_program = frappe.get_doc( diff --git a/erpnext/stock/doctype/stock_entry/services/manufacturing.py b/erpnext/stock/doctype/stock_entry/services/manufacturing.py index 25a7a376c8a..bfba22f1d44 100644 --- a/erpnext/stock/doctype/stock_entry/services/manufacturing.py +++ b/erpnext/stock/doctype/stock_entry/services/manufacturing.py @@ -597,6 +597,8 @@ class ManufactureStockEntry(BaseManufactureStockEntry): self.doc.append("items", item_args) def _resolve_rm_warehouse(self, row): + if self.wo_doc and self.wo_doc.skip_transfer and not self.wo_doc.from_wip_warehouse: + return row.get("source_warehouse") if self.doc.from_warehouse: return self.doc.from_warehouse if self.wo_doc and self.wo_doc.from_wip_warehouse: diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py index e7c5da910a4..b7c03df67ff 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py @@ -169,6 +169,10 @@ class IntegrationTestSubcontractingInwardOrder(ERPNextTestSuite): wo.submit() manufacture = frappe.new_doc("Stock Entry").update(make_stock_entry_from_wo(wo.name, "Manufacture")) + self.assertEqual( + next(item.s_warehouse for item in manufacture.items if item.item_code == "Self RM"), + "Stores - _TC", + ) manufacture.save() frappe.new_doc( "Stock Entry Detail",