diff --git a/press/api/central.py b/press/api/central.py index d9c0b1d3..a0ab23a9 100644 --- a/press/api/central.py +++ b/press/api/central.py @@ -7,7 +7,7 @@ from jingrow.geo.country_info import get_country_timezone_info from jcloude.api.account import get_account_request_from_key from jcloude.jcloude.pagetype.site.jerp_site import ( - ERPNextSite, + JERPSite, get_jerp_domain, get_jerp_plan, ) @@ -54,10 +54,10 @@ def account_request( pooled_site = get_pooled_site() if pooled_site: # Rename a standby site - ERPNextSite(site=pooled_site).rename_pooled_site(account_request) + JERPSite(site=pooled_site).rename_pooled_site(account_request) else: # Create a new site if pooled sites aren't available - site = ERPNextSite(account_request=account_request).insert(ignore_permissions=True) + site = JERPSite(account_request=account_request).insert(ignore_permissions=True) site.create_subscription(get_jerp_plan()) finally: jingrow.set_user(current_user) diff --git a/press/press/doctype/erpnext_app/erpnext_app.py b/press/press/doctype/erpnext_app/erpnext_app.py index fff4cf9a..331c11b2 100644 --- a/press/press/doctype/erpnext_app/erpnext_app.py +++ b/press/press/doctype/erpnext_app/erpnext_app.py @@ -7,7 +7,7 @@ from jingrow.model.document import Page -class ERPNextApp(Page): +class JERPApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/press/press/doctype/erpnext_consultant/erpnext_consultant.py b/press/press/doctype/erpnext_consultant/erpnext_consultant.py index 8fef3c46..50711b1f 100644 --- a/press/press/doctype/erpnext_consultant/erpnext_consultant.py +++ b/press/press/doctype/erpnext_consultant/erpnext_consultant.py @@ -8,7 +8,7 @@ from jingrow.model.document import Page from jingrow.utils import get_fullname -class ERPNextConsultant(Page): +class JERPConsultant(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -18,11 +18,11 @@ class ERPNextConsultant(Page): from jingrow.types import DF from jcloude.jcloude.pagetype.jerp_consultant_region.jerp_consultant_region import ( - ERPNextConsultantRegion, + JERPConsultantRegion, ) active: DF.Check - territories: DF.TableMultiSelect[ERPNextConsultantRegion] + territories: DF.TableMultiSelect[JERPConsultantRegion] user: DF.Link # end: auto-generated types @@ -38,9 +38,9 @@ class ERPNextConsultant(Page): SELECT consultant.name FROM - `tabERPNext Consultant` consultant + `tabJERP Consultant` consultant JOIN - `tabERPNext Consultant Region` region + `tabJERP Consultant Region` region ON region.parent = consultant.name WHERE diff --git a/press/press/doctype/erpnext_consultant/test_erpnext_consultant.py b/press/press/doctype/erpnext_consultant/test_erpnext_consultant.py index b100ca45..ec20d699 100644 --- a/press/press/doctype/erpnext_consultant/test_erpnext_consultant.py +++ b/press/press/doctype/erpnext_consultant/test_erpnext_consultant.py @@ -5,5 +5,5 @@ from jingrow.tests.utils import JingrowTestCase -class TestERPNextConsultant(JingrowTestCase): +class TestJERPConsultant(JingrowTestCase): pass diff --git a/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.py b/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.py index 438d6ffc..c1df4811 100644 --- a/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.py +++ b/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.py @@ -7,7 +7,7 @@ from jingrow.model.document import Page -class ERPNextConsultantRegion(Page): +class JERPConsultantRegion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/press/press/doctype/erpnext_site_settings/erpnext_site_settings.py b/press/press/doctype/erpnext_site_settings/erpnext_site_settings.py index f13f6c33..09843b75 100644 --- a/press/press/doctype/erpnext_site_settings/erpnext_site_settings.py +++ b/press/press/doctype/erpnext_site_settings/erpnext_site_settings.py @@ -7,7 +7,7 @@ import jingrow from jingrow.model.document import Page -class ERPNextSiteSettings(Page): +class JERPSiteSettings(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/press/press/doctype/erpnext_site_settings/test_erpnext_site_settings.py b/press/press/doctype/erpnext_site_settings/test_erpnext_site_settings.py index 86f50ccc..ab88c316 100644 --- a/press/press/doctype/erpnext_site_settings/test_erpnext_site_settings.py +++ b/press/press/doctype/erpnext_site_settings/test_erpnext_site_settings.py @@ -5,5 +5,5 @@ from jingrow.tests.utils import JingrowTestCase -class TestERPNextSiteSettings(JingrowTestCase): +class TestJERPSiteSettings(JingrowTestCase): pass diff --git a/press/press/doctype/press_settings/press_settings.py b/press/press/doctype/press_settings/press_settings.py index 310695fd..78f13e9d 100644 --- a/press/press/doctype/press_settings/press_settings.py +++ b/press/press/doctype/press_settings/press_settings.py @@ -24,7 +24,7 @@ class PressSettings(Page): from jingrow.types import DF from jcloude.jcloude.pagetype.app_group.app_group import AppGroup - from jcloude.jcloude.pagetype.jerp_app.jerp_app import ERPNextApp + from jcloude.jcloude.pagetype.jerp_app.jerp_app import JERPApp agent_github_access_token: DF.Data | None agent_repository_owner: DF.Data | None @@ -83,7 +83,7 @@ class PressSettings(Page): enforce_storage_limits: DF.Check jerp_api_key: DF.Data | None jerp_api_secret: DF.Password | None - jerp_apps: DF.Table[ERPNextApp] + jerp_apps: DF.Table[JERPApp] jerp_cluster: DF.Link | None jerp_domain: DF.Link | None jerp_group: DF.Link | None diff --git a/press/press/doctype/site/erpnext_site.py b/press/press/doctype/site/erpnext_site.py index dd12c534..355d9be5 100644 --- a/press/press/doctype/site/erpnext_site.py +++ b/press/press/doctype/site/erpnext_site.py @@ -5,11 +5,11 @@ import jingrow from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest -from jcloude.jcloude.pagetype.jerp_consultant.jerp_consultant import ERPNextConsultant +from jcloude.jcloude.pagetype.jerp_consultant.jerp_consultant import JERPConsultant from jcloude.jcloude.pagetype.site.site import Site -class ERPNextSite(Site): +class JERPSite(Site): def __init__(self, site=None, account_request: AccountRequest | None = None): if site: super().__init__("Site", site) @@ -24,7 +24,7 @@ class ERPNextSite(Site): "team": "Administrator", "account_request": account_request.name, "subscription_plan": get_jerp_plan(), - "jerp_consultant": ERPNextConsultant.get_one_for_country(account_request.country), + "jerp_consultant": JERPConsultant.get_one_for_country(account_request.country), "trial_end_date": jingrow.utils.add_days(None, 14), } ) @@ -36,7 +36,7 @@ class ERPNextSite(Site): self.trial_end_date = jingrow.utils.add_days(None, 14) plan = get_jerp_plan() self._update_configuration(self.get_plan_config(plan), save=False) - self.jerp_consultant = ERPNextConsultant.get_one_for_country(account_request.country) + self.jerp_consultant = JERPConsultant.get_one_for_country(account_request.country) self.save(ignore_permissions=True) self.create_subscription(plan) diff --git a/press/saas/doctype/saas_settings/saas_settings.py b/press/saas/doctype/saas_settings/saas_settings.py index a6e2a009..70968fc8 100644 --- a/press/saas/doctype/saas_settings/saas_settings.py +++ b/press/saas/doctype/saas_settings/saas_settings.py @@ -13,10 +13,10 @@ class SaasSettings(Page): if TYPE_CHECKING: from jingrow.types import DF - from jcloude.jcloude.pagetype.jerp_app.jerp_app import ERPNextApp + from jcloude.jcloude.pagetype.jerp_app.jerp_app import JERPApp app: DF.Link | None - apps: DF.Table[ERPNextApp] + apps: DF.Table[JERPApp] billing_type: DF.Literal["prepaid", "postpaid"] cluster: DF.Link | None default_team: DF.Link | None @@ -31,7 +31,7 @@ class SaasSettings(Page): site_plan: DF.Link | None standby_pool_size: DF.Int standby_queue_size: DF.Int - whitelisted_apps: DF.Table[ERPNextApp] + whitelisted_apps: DF.Table[JERPApp] # end: auto-generated types pass