test/jcloude
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ERPNext to JERP

Browse Source
This commit is contained in:
jingrow 2025-12-23 23:15:37 +08:00
parent 9416aef717
commit 13527566c1
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
press/api/central.py
View File

@ -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)

2
press/press/doctype/erpnext_app/erpnext_app.py
View File

@ -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.

10
press/press/doctype/erpnext_consultant/erpnext_consultant.py
View File

@ -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

2
press/press/doctype/erpnext_consultant/test_erpnext_consultant.py
View File

@ -5,5 +5,5 @@
from jingrow.tests.utils import JingrowTestCase
class TestERPNextConsultant(JingrowTestCase):
class TestJERPConsultant(JingrowTestCase):
pass

2
press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.py
View File

@ -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.

2
press/press/doctype/erpnext_site_settings/erpnext_site_settings.py
View File

@ -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.

2
press/press/doctype/erpnext_site_settings/test_erpnext_site_settings.py
View File

@ -5,5 +5,5 @@
from jingrow.tests.utils import JingrowTestCase
class TestERPNextSiteSettings(JingrowTestCase):
class TestJERPSiteSettings(JingrowTestCase):
pass

4
press/press/doctype/press_settings/press_settings.py
View File

@ -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

8
press/press/doctype/site/erpnext_site.py
View File

@ -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)

6
press/saas/doctype/saas_settings/saas_settings.py
View File

@ -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