From ac55028f6b31d745eb53131299cade53bd97d685 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 23 Sep 2025 13:09:59 +0530 Subject: [PATCH 1/2] chore: update sales_data from site_info (cherry picked from commit 866b252309bccf43a6d50b197171e7cd62123209) --- erpnext/utilities/__init__.py | 2 +- erpnext/utilities/activation.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/utilities/__init__.py b/erpnext/utilities/__init__.py index 24bfdc63af6..f01aa1312f6 100644 --- a/erpnext/utilities/__init__.py +++ b/erpnext/utilities/__init__.py @@ -37,7 +37,7 @@ def get_site_info(site_info): if company: domain = frappe.get_cached_value("Company", cstr(company), "domain") - return {"company": company, "domain": domain, "activation": get_level()} + return {"company": company, "domain": domain, "activation": get_level(site_info)} @contextmanager diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py index e09d87dd769..509c9836d3c 100644 --- a/erpnext/utilities/activation.py +++ b/erpnext/utilities/activation.py @@ -9,9 +9,9 @@ from frappe.core.doctype.installed_applications.installed_applications import ge import erpnext -def get_level(): - activation_level = 0 - sales_data = [] +def get_level(site_info): + activation_level = site_info.get("activation", {}).get("activation_level", 0) + sales_data = site_info.get("activation", {}).get("sales_data", []) min_count = 0 doctypes = { "Asset": 5, From ff08ee6ada2e8dbdc4596f77a47a4f78265f6283 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 23 Sep 2025 14:06:02 +0530 Subject: [PATCH 2/2] test: activation with site_info (cherry picked from commit 5a26d593e4ec91098599b4c2260b6bc63a1b2532) --- erpnext/tests/test_activation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/tests/test_activation.py b/erpnext/tests/test_activation.py index b56e2332cf4..ec210c919de 100644 --- a/erpnext/tests/test_activation.py +++ b/erpnext/tests/test_activation.py @@ -5,5 +5,6 @@ from erpnext.utilities.activation import get_level class TestActivation(FrappeTestCase): def test_activation(self): - levels = get_level() + site_info = {"activation": {"activation_level": 0, "sales_data": []}} + levels = get_level(site_info) self.assertTrue(levels)