From 941a56874a9ecf1876a38661ed7a4d7d70676013 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Sun, 13 Apr 2025 17:16:13 +0800
Subject: [PATCH] update to PAGETYPE pageperm pagestatus

---
 .../src/components/InvoiceUsageTable.vue      |   2 +-
 dashboard/src2/pages/BillingBalances.vue      |   2 +-
 jcloud/api/account.py                         |   4 +-
 jcloud/api/billing.py                         |  10 +-
 jcloud/api/client.py                          |   8 +-
 jcloud/api/regional_payments/mpesa/utils.py   |   2 +-
 jcloud/fixtures/agent_job_type.json           | 168 +++++++++---------
 jcloud/fixtures/bench_dependency.json         |  10 +-
 jcloud/fixtures/cloud_region.json             |  24 +--
 jcloud/fixtures/jcloud_job_type.json          |  18 +-
 jcloud/fixtures/jcloud_method_permission.json |  48 ++---
 jcloud/fixtures/jcloud_webhook_event.json     |   4 +-
 jcloud/fixtures/jingrow_version.json          |  10 +-
 jcloud/fixtures/mariadb_variable.json         |  72 ++++----
 jcloud/fixtures/print_format.json             |   2 +-
 jcloud/fixtures/role.json                     |   6 +-
 jcloud/fixtures/server_storage_plan.json      |   2 +-
 jcloud/fixtures/site_config_key.json          | 104 +++++------
 .../fixtures/site_config_key_blacklist.json   |  52 +++---
 jcloud/jcloud/audit.py                        |   4 +-
 jcloud/jcloud/custom/address.json             |  14 +-
 jcloud/jcloud/custom/country.json             |   2 +-
 .../pagetype/agent_job/test_agent_job.py      |   2 +-
 .../balance_transaction.py                    |   6 +-
 jcloud/jcloud/pagetype/invoice/invoice.js     |   4 +-
 jcloud/jcloud/pagetype/invoice/invoice.py     |  10 +-
 .../pagetype/invoice/mark_as_uncollectible.py |   2 +-
 .../invoice/patches/set_free_credits.py       |   2 +-
 .../patches/set_transaction_details.py        |   2 +-
 .../jcloud/pagetype/invoice/test_invoice.py   |   4 +-
 .../jcloud_permission_group.py                |   6 +-
 .../mpesa_payment_record.py                   |   2 +-
 .../partner_payment_payout.js                 |   2 +-
 .../patches/compute_total_amount.py           |   2 +-
 .../pagetype/payout_order/payout_order.py     |   2 +-
 jcloud/jcloud/pagetype/site/site.py           |   4 +-
 .../stripe_payment_event.py                   |   2 +-
 jcloud/jcloud/pagetype/team/suspend_sites.py  |   2 +-
 jcloud/jcloud/pagetype/team/team.py           |  14 +-
 .../team_deletion_request.py                  |   2 +-
 .../pagetype/usage_record/usage_record.py     |   4 +-
 .../user_ssh_certificate.js                   |   2 +-
 .../user_ssh_certificate.py                   |   2 +-
 .../report/agent_versions/agent_versions.json |   2 +-
 .../aws_instance_pricing.json                 |   2 +-
 .../aws_rightsizing_recommendation.json       |   2 +-
 .../bench_memory_limits.json                  |   2 +-
 .../binary_log_browser.json                   |   2 +-
 .../mariadb_deadlock_browser.json             |   2 +-
 .../mariadb_locks_list.json                   |   2 +-
 .../mariadb_process_list.json                 |   2 +-
 .../mariadb_slow_queries.json                 |   2 +-
 ...marketplace_app_repository_visibility.json |   2 +-
 .../report/server_stats/server_stats.json     |   2 +-
 .../shared_app_server_stats.json              |   2 +-
 jcloud/jcloud/workspace/jcloud/jcloud.json    |   2 +-
 .../v0_0_1/create_invoice_for_past_ples.py    |   6 +-
 jcloud/patches/v0_0_1/ple_to_usage_record.py  |   4 +-
 58 files changed, 341 insertions(+), 341 deletions(-)

diff --git a/dashboard/src/components/InvoiceUsageTable.vue b/dashboard/src/components/InvoiceUsageTable.vue
index 85e0f22..5347459 100644
--- a/dashboard/src/components/InvoiceUsageTable.vue
+++ b/dashboard/src/components/InvoiceUsageTable.vue
@@ -94,7 +94,7 @@
 							}}
 						</td>
 					</tr>
-					<template v-if="pg.total !== pg.amount_due && pg.docstatus == 1">
+					<template v-if="pg.total !== pg.amount_due && pg.pagestatus == 1">
 						<tr>
 							<td></td>
 							<td class="pr-2 text-right">Applied Balance:</td>
diff --git a/dashboard/src2/pages/BillingBalances.vue b/dashboard/src2/pages/BillingBalances.vue
index b679dfc..f321d68 100644
--- a/dashboard/src2/pages/BillingBalances.vue
+++ b/dashboard/src2/pages/BillingBalances.vue
@@ -88,7 +88,7 @@ export default {
 					}
 				],
 				filters: {
-					docstatus: 1,
+					pagestatus: 1,
 					team: this.$team.name
 				},
 				orderBy: 'creation desc'
diff --git a/jcloud/api/account.py b/jcloud/api/account.py
index a96b139..87c0027 100644
--- a/jcloud/api/account.py
+++ b/jcloud/api/account.py
@@ -657,7 +657,7 @@ def get_permissions():
 	groups = tuple(
 		[*jingrow.get_all("Jcloud Permission Group User", {"user": user}, pluck="parent"), "1", "2"]
 	)  # [1, 2] is for avoiding singleton tuples
-	docperms = jingrow.db.sql(
+	pageperms = jingrow.db.sql(
 		f"""
 			SELECT `document_name`, GROUP_CONCAT(`action`) as `actions`
 			FROM `tabJcloud User Permission`
@@ -666,7 +666,7 @@ def get_permissions():
 		""",
 		as_dict=True,
 	)
-	return {perm.document_name: perm.actions.split(",") for perm in docperms if perm.actions}
+	return {perm.document_name: perm.actions.split(",") for perm in pageperms if perm.actions}
 
 
 @jingrow.whitelist()
diff --git a/jcloud/api/billing.py b/jcloud/api/billing.py
index 5b7322a..bd46189 100644
--- a/jcloud/api/billing.py
+++ b/jcloud/api/billing.py
@@ -100,7 +100,7 @@ def balances():
 		filters={
 			"source": ("in", ("Prepaid Credits", "Transferred Credits", "Free Credits")),
 			"team": team,
-			"docstatus": 1,
+			"pagestatus": 1,
 			"type": ("!=", "Partnership Fee"),
 		},
 		limit=1,
@@ -125,7 +125,7 @@ def balances():
 			bt.description,
 			inv.period_start,
 		)
-		.where((bt.docstatus == 1) & (bt.team == team))
+		.where((bt.pagestatus == 1) & (bt.team == team))
 		.orderby(bt.creation, order=jingrow.qb.desc)
 	)
 
@@ -680,7 +680,7 @@ def total_unpaid_amount():
 	return (
 		jingrow.get_all(
 			"Invoice",
-			{"status": "Unpaid", "team": team.name, "type": "Subscription", "docstatus": ("!=", 2)},
+			{"status": "Unpaid", "team": team.name, "type": "Subscription", "pagestatus": ("!=", 2)},
 			["sum(amount_due) as total"],
 			pluck="total",
 		)[0]
@@ -1832,13 +1832,13 @@ def get_balance_transactions(page=1, page_size=20, search=None):
         team = get_current_team(True)
         
         # 构建基础过滤条件
-        filters = {"team": team.name, "docstatus": 1}  # 已提交的文档
+        filters = {"team": team.name, "pagestatus": 1}  # 已提交的文档
         
         # 添加搜索条件（如果提供）
         if search:
             filters = [
                 ["Balance Transaction", "team", "=", team.name], 
-                ["Balance Transaction", "docstatus", "=", 1],
+                ["Balance Transaction", "pagestatus", "=", 1],
                 [
                     "Balance Transaction", 
                     "description|source|type|invoice", 
diff --git a/jcloud/api/client.py b/jcloud/api/client.py
index 13c7a4a..fee5b10 100644
--- a/jcloud/api/client.py
+++ b/jcloud/api/client.py
@@ -20,7 +20,7 @@ from jcloud.utils import has_role
 if typing.TYPE_CHECKING:
 	from jingrow.model.meta import Meta
 
-ALLOWED_DOCTYPES = [
+ALLOWED_PAGETYPES = [
 	"Site",
 	"Site App",
 	"Site Domain",
@@ -79,7 +79,7 @@ ALLOWED_DOCTYPES = [
 	"Mpesa Payment Record",
 ]
 
-ALLOWED_DOCTYPES_FOR_SUPPORT = [
+ALLOWED_PAGETYPES_FOR_SUPPORT = [
 	"Site",
 	"Bench",
 	"Release Group",
@@ -357,7 +357,7 @@ def check_document_access(pagetype: str, name: str):
 	if jingrow.local.system_user():
 		return
 
-	if has_role("Jcloud Support Agent") and pagetype in ALLOWED_DOCTYPES_FOR_SUPPORT:
+	if has_role("Jcloud Support Agent") and pagetype in ALLOWED_PAGETYPES_FOR_SUPPORT:
 		return
 
 	team = ""
@@ -479,7 +479,7 @@ def is_allowed_table_field(pagetype, field):
 
 
 def check_permissions(pagetype):
-	if pagetype not in ALLOWED_DOCTYPES:
+	if pagetype not in ALLOWED_PAGETYPES:
 		raise_not_permitted()
 
 	if not hasattr(jingrow.local, "team") or not jingrow.local.team():
diff --git a/jcloud/api/regional_payments/mpesa/utils.py b/jcloud/api/regional_payments/mpesa/utils.py
index b89c2b7..01f4272 100644
--- a/jcloud/api/regional_payments/mpesa/utils.py
+++ b/jcloud/api/regional_payments/mpesa/utils.py
@@ -387,7 +387,7 @@ def fetch_payments(payment_gateway, partner, from_date, to_date):
 	print("fetching payments", payment_gateway)
 	partner = jingrow.get_value("Team", {"user": partner}, "name")
 	filters = {
-		"docstatus": 1,
+		"pagestatus": 1,
 		"submitted_to_jingrow": 0,
 		"payment_gateway": payment_gateway,
 		"payment_partner": partner,
diff --git a/jcloud/fixtures/agent_job_type.json b/jcloud/fixtures/agent_job_type.json
index 537fcf5..54f5f19 100644
--- a/jcloud/fixtures/agent_job_type.json
+++ b/jcloud/fixtures/agent_job_type.json
@@ -1,7 +1,7 @@
 [
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-08-20 12:32:56.100866",
@@ -28,7 +28,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-02-13 13:25:40.384742",
@@ -49,7 +49,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.228754",
@@ -70,7 +70,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-08-09 10:07:51.319214",
@@ -109,7 +109,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.549528",
@@ -130,7 +130,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.927111",
@@ -151,7 +151,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.946695",
@@ -172,7 +172,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.762138",
@@ -205,7 +205,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.585210",
@@ -256,7 +256,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.646447",
@@ -277,7 +277,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.671517",
@@ -298,7 +298,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.651948",
@@ -319,7 +319,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.724970",
@@ -343,7 +343,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.707766",
@@ -358,7 +358,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.743617",
@@ -373,7 +373,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.690936",
@@ -394,7 +394,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.607088",
@@ -415,7 +415,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.677444",
@@ -430,7 +430,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.839292",
@@ -475,7 +475,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.690831",
@@ -490,7 +490,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.706871",
@@ -511,7 +511,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.740351",
@@ -526,7 +526,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.805097",
@@ -553,7 +553,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.786058",
@@ -568,7 +568,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.625189",
@@ -601,7 +601,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.893005",
@@ -622,7 +622,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.911153",
@@ -637,7 +637,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.963183",
@@ -652,7 +652,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.000340",
@@ -676,7 +676,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.979580",
@@ -697,7 +697,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.100535",
@@ -724,7 +724,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.131920",
@@ -745,7 +745,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.180358",
@@ -763,7 +763,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.157390",
@@ -781,7 +781,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.203468",
@@ -799,7 +799,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.283667",
@@ -820,7 +820,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.308026",
@@ -838,7 +838,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.327716",
@@ -853,7 +853,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.345276",
@@ -868,7 +868,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.362722",
@@ -889,7 +889,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.379874",
@@ -904,7 +904,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.392780",
@@ -919,7 +919,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.405690",
@@ -934,7 +934,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.256524",
@@ -955,7 +955,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.446023",
@@ -970,7 +970,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.419313",
@@ -985,7 +985,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.502147",
@@ -1012,7 +1012,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.531987",
@@ -1048,7 +1048,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.556954",
@@ -1063,7 +1063,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.759939",
@@ -1081,7 +1081,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.725087",
@@ -1099,7 +1099,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.432717",
@@ -1114,7 +1114,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.568610",
@@ -1132,7 +1132,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.023648",
@@ -1156,7 +1156,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.845251",
@@ -1177,7 +1177,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.822202",
@@ -1204,7 +1204,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.803361",
@@ -1219,7 +1219,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.861985",
@@ -1234,7 +1234,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-02-22 20:01:05.606166",
@@ -1249,7 +1249,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-02-27 13:51:17.142316",
@@ -1270,7 +1270,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-03-19 11:40:26.237476",
@@ -1285,7 +1285,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-03-26 10:28:39.750285",
@@ -1306,7 +1306,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-07-11 12:04:37.550558",
@@ -1321,7 +1321,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.470276",
@@ -1363,7 +1363,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-07-18 17:49:54.294402",
@@ -1378,7 +1378,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-08-09 12:03:58.145567",
@@ -1393,7 +1393,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-06-11 19:43:45.877056",
@@ -1408,7 +1408,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-08-09 10:10:41.301700",
@@ -1441,7 +1441,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.626647",
@@ -1462,7 +1462,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.663533",
@@ -1477,7 +1477,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.587094",
@@ -1498,7 +1498,7 @@
  },
  {
   "disabled_auto_retry": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.510770",
@@ -1519,7 +1519,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-09-10 12:11:38.844112",
@@ -1543,7 +1543,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-09-11 13:28:32.120581",
@@ -1558,7 +1558,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-08-20 12:51:05.293373",
@@ -1585,7 +1585,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-11-04 14:49:18.592247",
@@ -1600,7 +1600,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-11-04 14:49:18.592247",
@@ -1615,7 +1615,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-11-04 14:49:18.592247",
@@ -1630,7 +1630,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-10-28 14:49:19.894247",
@@ -1645,7 +1645,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-12-19 17:21:14.136650",
@@ -1660,7 +1660,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-01-09 17:07:45.359754",
@@ -1696,7 +1696,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-01-19 22:57:23.072792",
@@ -1750,7 +1750,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-01-21 15:31:19.602466",
@@ -1765,7 +1765,7 @@
  },
  {
   "disabled_auto_retry": 1,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-01-21 15:32:21.823510",
diff --git a/jcloud/fixtures/bench_dependency.json b/jcloud/fixtures/bench_dependency.json
index ea3f860..ef3c96d 100644
--- a/jcloud/fixtures/bench_dependency.json
+++ b/jcloud/fixtures/bench_dependency.json
@@ -1,6 +1,6 @@
 [
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Bench Dependency",
   "internal": 0,
   "modified": "2023-09-26 19:45:32.017532",
@@ -82,7 +82,7 @@
   "title": "Python Version"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Bench Dependency",
   "internal": 0,
   "modified": "2023-10-06 15:45:18.593014",
@@ -140,7 +140,7 @@
   "title": "Node Version"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Bench Dependency",
   "internal": 0,
   "modified": "2023-09-27 09:37:02.358511",
@@ -270,7 +270,7 @@
   "title": "Wkhtmltopdf Version"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Bench Dependency",
   "internal": 0,
   "modified": "2023-10-28 22:08:23.853052",
@@ -392,7 +392,7 @@
   "title": "Bench Version"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Bench Dependency",
   "internal": 1,
   "modified": "2023-09-26 15:46:26.816012",
diff --git a/jcloud/fixtures/cloud_region.json b/jcloud/fixtures/cloud_region.json
index f4bc7b5..33c3f37 100644
--- a/jcloud/fixtures/cloud_region.json
+++ b/jcloud/fixtures/cloud_region.json
@@ -1,6 +1,6 @@
 [
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:33:57.631284",
   "name": "ap-south-1",
@@ -8,7 +8,7 @@
   "region_name": "ap-south-1"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:06.958325",
   "name": "eu-west-2",
@@ -16,7 +16,7 @@
   "region_name": "eu-west-2"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:15.834702",
   "name": "eu-central-2",
@@ -24,7 +24,7 @@
   "region_name": "eu-central-2"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:23.204769",
   "name": "ap-southeast-1",
@@ -32,7 +32,7 @@
   "region_name": "ap-southeast-1"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:40.385001",
   "name": "me-south-1",
@@ -40,7 +40,7 @@
   "region_name": "me-south-1"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:53.773228",
   "name": "af-south-1",
@@ -48,7 +48,7 @@
   "region_name": "af-south-1"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:59.528123",
   "name": "us-east-1",
@@ -56,7 +56,7 @@
   "region_name": "us-east-1"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:33.152010",
   "name": "eu-central-1",
@@ -64,7 +64,7 @@
   "region_name": "eu-central-1"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:47:04.247556",
   "name": "fsn1",
@@ -72,7 +72,7 @@
   "region_name": "fsn1"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:48:01.851504",
   "name": "sin",
@@ -80,7 +80,7 @@
   "region_name": "sin"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:47:41.953263",
   "name": "ash",
@@ -88,7 +88,7 @@
   "region_name": "ash"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:48:48.686461",
   "name": "nbg1",
diff --git a/jcloud/fixtures/jcloud_job_type.json b/jcloud/fixtures/jcloud_job_type.json
index 11cf959..1f0e593 100644
--- a/jcloud/fixtures/jcloud_job_type.json
+++ b/jcloud/fixtures/jcloud_job_type.json
@@ -1,6 +1,6 @@
 [
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2025-01-02 15:31:03.095292",
   "name": "Create Server",
@@ -68,7 +68,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2025-01-02 15:33:27.252601",
   "name": "Resize Server",
@@ -116,7 +116,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2024-02-05 17:08:00.514456",
   "name": "Create Server Snapshot",
@@ -154,7 +154,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2022-11-01 14:35:52.936503",
   "name": "Archive Server",
@@ -177,7 +177,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2024-01-05 13:40:21.038901",
   "name": "Upgrade MariaDB",
@@ -210,7 +210,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2025-02-14 14:30:00.676187",
   "name": "Increase Disk Size",
@@ -243,7 +243,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2024-05-27 11:29:41.787719",
   "name": "Prune Docker system",
@@ -261,7 +261,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2024-06-18 16:03:25.166898",
   "name": "Increase Swap",
@@ -279,7 +279,7 @@
   ]
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Job Type",
   "modified": "2024-12-06 10:59:08.032149",
   "name": "Stop and Start Server",
diff --git a/jcloud/fixtures/jcloud_method_permission.json b/jcloud/fixtures/jcloud_method_permission.json
index 3557b67..7ef02ee 100644
--- a/jcloud/fixtures/jcloud_method_permission.json
+++ b/jcloud/fixtures/jcloud_method_permission.json
@@ -1,7 +1,7 @@
 [
  {
   "checkbox_label": "View",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Server",
   "method": "jcloud.api.server.overview",
@@ -10,7 +10,7 @@
  },
  {
   "checkbox_label": "Reboot",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Server",
   "method": "jcloud.api.server.reboot",
@@ -19,7 +19,7 @@
  },
  {
   "checkbox_label": "Login as Admin",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.login",
@@ -28,7 +28,7 @@
  },
  {
   "checkbox_label": "Database Access",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.enable_database_access",
@@ -37,7 +37,7 @@
  },
  {
   "checkbox_label": "Update",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Release Group",
   "method": "jcloud.api.bench.update",
@@ -46,7 +46,7 @@
  },
  {
   "checkbox_label": "Update",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.update",
@@ -55,7 +55,7 @@
  },
  {
   "checkbox_label": "View",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.overview",
@@ -64,7 +64,7 @@
  },
  {
   "checkbox_label": "Restore",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.restore",
@@ -73,7 +73,7 @@
  },
  {
   "checkbox_label": "Migrate",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.migrate",
@@ -82,7 +82,7 @@
  },
  {
   "checkbox_label": "View",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Release Group",
   "method": "jcloud.api.bench.get",
@@ -91,7 +91,7 @@
  },
  {
   "checkbox_label": "Update",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.update",
@@ -100,7 +100,7 @@
  },
  {
   "checkbox_label": "Deploy",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Release Group",
   "method": "jcloud.api.bench.deploy_and_update",
@@ -109,7 +109,7 @@
  },
  {
   "checkbox_label": "Archive",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.archive",
@@ -118,7 +118,7 @@
  },
  {
   "checkbox_label": "Reset",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.reset",
@@ -127,7 +127,7 @@
  },
  {
   "checkbox_label": "Deactivate",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.deactivate",
@@ -136,7 +136,7 @@
  },
  {
   "checkbox_label": "SSH Access",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Release Group",
   "method": "jcloud.api.bench.generate_certificate",
@@ -145,7 +145,7 @@
  },
  {
   "checkbox_label": "Restart",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Release Group",
   "method": "jcloud.api.bench.restart",
@@ -154,7 +154,7 @@
  },
  {
   "checkbox_label": "Change Plan",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.change_plan",
@@ -163,7 +163,7 @@
  },
  {
   "checkbox_label": "Download Backups",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Site",
   "method": "jcloud.api.site.get_backup_link",
@@ -172,7 +172,7 @@
  },
  {
   "checkbox_label": "View",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Database Server",
   "method": "jcloud.api.server.overview",
@@ -181,7 +181,7 @@
  },
  {
   "checkbox_label": "Drop",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Server",
   "method": "jcloud.api.server.archive",
@@ -190,7 +190,7 @@
  },
  {
   "checkbox_label": "Drop",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Database Server",
   "method": "jcloud.api.server.archive",
@@ -199,7 +199,7 @@
  },
  {
   "checkbox_label": "Reboot",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Database Server",
   "method": "jcloud.api.server.reboot",
@@ -208,7 +208,7 @@
  },
  {
   "checkbox_label": "View",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Method Permission",
   "document_type": "Marketplace App",
   "method": "jcloud.api.marketplace.get_app",
diff --git a/jcloud/fixtures/jcloud_webhook_event.json b/jcloud/fixtures/jcloud_webhook_event.json
index f74521b..589a4fb 100644
--- a/jcloud/fixtures/jcloud_webhook_event.json
+++ b/jcloud/fixtures/jcloud_webhook_event.json
@@ -1,7 +1,7 @@
 [
  {
   "description": "获取站点订阅计划变更的通知",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Webhook Event",
   "enabled": 1,
   "modified": "2024-09-23 12:06:21.293809",
@@ -10,7 +10,7 @@
  },
  {
   "description": "等待中、安装中、更新中、活跃、不活跃、异常、已归档、已暂停",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jcloud Webhook Event",
   "enabled": 1,
   "modified": "2024-09-23 11:47:30.206054",
diff --git a/jcloud/fixtures/jingrow_version.json b/jcloud/fixtures/jingrow_version.json
index d7a94f5..a93ee2e 100644
--- a/jcloud/fixtures/jingrow_version.json
+++ b/jcloud/fixtures/jingrow_version.json
@@ -38,7 +38,7 @@
     "version": "5.15.2"
    }
   ],
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jingrow Version",
   "modified": "2024-06-27 14:45:44.660933",
   "name": "Version 12",
@@ -85,7 +85,7 @@
     "version": "5.15.2"
    }
   ],
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jingrow Version",
   "modified": "2024-06-27 14:45:38.192207",
   "name": "Version 13",
@@ -132,7 +132,7 @@
     "version": "5.22.6"
    }
   ],
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jingrow Version",
   "modified": "2023-07-21 19:46:37.813960",
   "name": "Nightly",
@@ -179,7 +179,7 @@
     "version": "5.15.2"
    }
   ],
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jingrow Version",
   "modified": "2023-07-21 19:44:34.122005",
   "name": "Version 14",
@@ -226,7 +226,7 @@
     "version": "5.22.6"
    }
   ],
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Jingrow Version",
   "modified": "2023-07-19 17:31:05.044895",
   "name": "Version 15",
diff --git a/jcloud/fixtures/mariadb_variable.json b/jcloud/fixtures/mariadb_variable.json
index 068dcd8..1c7c8c3 100644
--- a/jcloud/fixtures/mariadb_variable.json
+++ b/jcloud/fixtures/mariadb_variable.json
@@ -3,7 +3,7 @@
   "datatype": "Str",
   "default_value": "0",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 18:21:51.984252",
@@ -15,7 +15,7 @@
   "datatype": "Str",
   "default_value": "\"\"",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.751992",
@@ -27,7 +27,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.766945",
@@ -39,7 +39,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.784028",
@@ -51,7 +51,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.809367",
@@ -63,7 +63,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.833060",
@@ -75,7 +75,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.851892",
@@ -87,7 +87,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.870716",
@@ -99,7 +99,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.951921",
@@ -111,7 +111,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.971205",
@@ -123,7 +123,7 @@
   "datatype": "Str",
   "default_value": "OFF",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.987419",
@@ -135,7 +135,7 @@
   "datatype": "Int",
   "default_value": "5120",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:51:29.101315",
@@ -147,7 +147,7 @@
   "datatype": "Str",
   "default_value": "5",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:52:00.473677",
@@ -159,7 +159,7 @@
   "datatype": "Str",
   "default_value": "200",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:50:54.084797",
@@ -171,7 +171,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-01-12 14:21:03.949888",
@@ -183,7 +183,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "replication-and-binary-log",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-03-05 12:59:31.069472",
@@ -195,7 +195,7 @@
   "datatype": "Int",
   "default_value": "32",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-06-12 10:30:47.403256",
@@ -207,7 +207,7 @@
   "datatype": "Str",
   "default_value": "",
   "pg_section": "replication-and-binary-log",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2023-08-03 14:20:47.702196",
@@ -219,7 +219,7 @@
   "datatype": "Str",
   "default_value": "37",
   "pg_section": "innodb",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2023-09-15 15:21:13.086214",
@@ -231,7 +231,7 @@
   "datatype": "Int",
   "default_value": null,
   "pg_section": "innodb",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2023-06-15 14:41:36.038646",
@@ -243,7 +243,7 @@
   "datatype": "Str",
   "default_value": "/var/lib/mysql/mysql-bin",
   "pg_section": "replication-and-binary-log",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-06-15 14:41:09.156699",
@@ -255,7 +255,7 @@
   "datatype": "Str",
   "default_value": "5000",
   "pg_section": "innodb",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:50:46.547631",
@@ -267,7 +267,7 @@
   "datatype": "Int",
   "default_value": "512",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:51:34.994866",
@@ -279,7 +279,7 @@
   "datatype": "Str",
   "default_value": "3600",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:50:58.514076",
@@ -291,7 +291,7 @@
   "datatype": "Str",
   "default_value": "ON",
   "pg_section": "innodb",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-12-04 16:30:16.720727",
@@ -303,7 +303,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "innodb",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-08-31 13:53:59.926965",
@@ -315,7 +315,7 @@
   "datatype": "Str",
   "default_value": "50",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-08-14 15:54:38.037523",
@@ -327,7 +327,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-10-09 09:00:46.202412",
@@ -339,7 +339,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-10-21 13:02:20.343316",
@@ -351,7 +351,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-10-21 13:03:05.958798",
@@ -363,7 +363,7 @@
   "datatype": "Str",
   "default_value": "FORCE",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2024-11-22 12:31:31.593757",
@@ -375,7 +375,7 @@
   "datatype": "Str",
   "default_value": "3307",
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2024-11-22 12:52:35.958089",
@@ -387,7 +387,7 @@
   "datatype": "Str",
   "default_value": "MIXED",
   "pg_section": "replication-and-binary-log",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2024-12-12 12:59:33.579411",
@@ -399,7 +399,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-01-13 12:24:41.969815",
@@ -411,7 +411,7 @@
   "datatype": "Str",
   "default_value": null,
   "pg_section": "server",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2025-01-24 15:40:01.244238",
@@ -423,7 +423,7 @@
   "datatype": "Str",
   "default_value": "ON",
   "pg_section": "innodb",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-03-04 16:43:33.176673",
diff --git a/jcloud/fixtures/print_format.json b/jcloud/fixtures/print_format.json
index a58b6d4..0f2f2fc 100644
--- a/jcloud/fixtures/print_format.json
+++ b/jcloud/fixtures/print_format.json
@@ -6,7 +6,7 @@
   "default_print_language": null,
   "disabled": 0,
   "pg_type": "Invoice",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Print Format",
   "font": "Default",
   "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"{% set months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] %}\\n\\n<div style=\\\"margin-bottom: 30px; margin-top: 12px; font-size: 16px;\\\">\\n    Invoice for {{ months[pg.month - 1] }} {{ pg.year}} billing period\\n</div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<div>\\n    <label>From</label>\\n    <div>\\n        Jingrow Technologies Pvt. Ltd.<br>\\n        D/324, Neelkanth Business Park,<br>\\n        Vidyavihar (W), Mumbai 4000 86, China.\\n    </div>\\n</div>\\n\\n<div style=\\\"margin-top: 15px;\\\">\\n    <label>Bill To</label>\\n    <div>\\n        {% set address = jingrow.db.get_value('Team', pg.team, 'billing_address') %}\\n        {{ jingrow.get_pg('Address', address).get_display() if address else '' }}\\n    </div>\\n</div>\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"{% set details = {\\n    'Invoice': pg.name,\\n    'Payment due on': jingrow.utils.global_date_format(pg.due_date)\\n} %}\\n{% for d in details %}\\n<div class=\\\"row\\\">\\n    <div class=\\\"col-xs-6\\\">\\n        <label>{{ d }}</label>\\n    </div>\\n    <div class=\\\"col-xs-6 text-right\\\">\\n        {{ details[d] }}\\n    </div>\\n</div>\\n{% endfor %}\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<h2 style=\\\"margin: 30px 0;\\\">\\n  Total due {{ pg.get_formatted('amount_due') }} on {{\\n  jingrow.utils.global_date_format(pg.due_date) }}\\n</h2>\\n\\n<h4>Usage Charges</h4>\\n\\n<table class=\\\"table\\\" style=\\\"width: 100%; margin-top: 0;\\\">\\n  <thead>\\n    <tr>\\n      <th>Site</th>\\n      <th>Plan</th>\\n      <th class=\\\"text-right\\\">Days</th>\\n      <th class=\\\"text-right\\\">Amount</th>\\n    </tr>\\n  </thead>\\n  <tbody>\\n    {% for row in pg.site_usage %} {% set lineitem = pg.items[loop.index - 1]\\n    %}\\n    <tr>\\n      <td>{{ row.site }}</td>\\n      <td>{{ jingrow.db.get_value('Plan', row.plan, 'plan_title') }}</td>\\n      <td class=\\\"text-right\\\">{{ jingrow.utils.cint(row.days_active) }}</td>\\n      <td class=\\\"text-right\\\">{{ lineitem.get_formatted('amount') }}</td>\\n    </tr>\\n    {% endfor %}\\n  </tbody>\\n  <tr>\\n    <td colspan=\\\"4\\\"></td>\\n  </tr>\\n  <tr>\\n    <td colspan=\\\"3\\\" class=\\\"text-right\\\" style=\\\"font-weight: bold;\\\">\\n      Total\\n    </td>\\n    <td class=\\\"text-right\\\">{{ pg.get_formatted('total') }}</td>\\n  </tr>\\n  {% if pg.amount_due > 0 %}\\n  <tr>\\n    <td colspan=\\\"3\\\" class=\\\"text-right\\\" style=\\\"font-weight: bold;\\\">\\n      Applied Credit Balance\\n    </td>\\n    <td class=\\\"text-right\\\">{{ pg.get_formatted('starting_balance') }}</td>\\n  </tr>\\n  <tr>\\n    <td colspan=\\\"3\\\" class=\\\"text-right\\\" style=\\\"font-weight: bold;\\\">\\n      Amount Due\\n    </td>\\n    <td class=\\\"text-right\\\">{{ pg.get_formatted('amount_due') }}</td>\\n  </tr>\\n  {% endif %}\\n</table>\\n\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Stripe Billing\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<div style=\\\"margin-top: 50px;\\\">\\n    If you have added a card on file, then it will automatically be charged.<br> If not, pay using the following link: {{ pg.stripe_invoice_url }}\\n</div>\"}]",
diff --git a/jcloud/fixtures/role.json b/jcloud/fixtures/role.json
index d334f4b..8e9d917 100644
--- a/jcloud/fixtures/role.json
+++ b/jcloud/fixtures/role.json
@@ -4,7 +4,7 @@
   "dashboard": 0,
   "desk_access": 0,
   "disabled": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Role",
   "form_sidebar": 0,
   "home_page": null,
@@ -25,7 +25,7 @@
   "dashboard": 0,
   "desk_access": 0,
   "disabled": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Role",
   "form_sidebar": 0,
   "home_page": null,
@@ -46,7 +46,7 @@
   "dashboard": 0,
   "desk_access": 0,
   "disabled": 0,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Role",
   "form_sidebar": 0,
   "home_page": null,
diff --git a/jcloud/fixtures/server_storage_plan.json b/jcloud/fixtures/server_storage_plan.json
index 7081e2f..0dca364 100644
--- a/jcloud/fixtures/server_storage_plan.json
+++ b/jcloud/fixtures/server_storage_plan.json
@@ -1,6 +1,6 @@
 [
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Server Storage Plan",
   "enabled": 1,
   "modified": "2024-06-27 12:34:02.292945",
diff --git a/jcloud/fixtures/site_config_key.json b/jcloud/fixtures/site_config_key.json
index eebe9e0..f1b1169 100644
--- a/jcloud/fixtures/site_config_key.json
+++ b/jcloud/fixtures/site_config_key.json
@@ -1,7 +1,7 @@
 [
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "dropbox_secret_key",
@@ -15,7 +15,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "google_analytics_id",
@@ -29,7 +29,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "server_script_enabled",
@@ -43,7 +43,7 @@
  },
  {
   "description": "For MixPanel analytics on desk",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mixpanel_id",
@@ -57,7 +57,7 @@
  },
  {
   "description": "Utilise jingrow.debug_log via jingrow.log to enable different levels of logging. At level 2, shows queries and results run at every action.",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "logging",
@@ -71,7 +71,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "paypal_password",
@@ -85,7 +85,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_scheduler",
@@ -99,7 +99,7 @@
  },
  {
   "description": "Skips socket.IO setup on frontend",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_async",
@@ -113,7 +113,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_server",
@@ -127,7 +127,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "pause_scheduler",
@@ -141,7 +141,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "email_sender_name",
@@ -155,7 +155,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_secret",
@@ -169,7 +169,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "error_report_email",
@@ -183,7 +183,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_login",
@@ -197,7 +197,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_key",
@@ -211,7 +211,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "dropbox_broker_site",
@@ -225,7 +225,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "dropbox_access_key",
@@ -239,7 +239,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_password",
@@ -253,7 +253,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_publishable_key",
@@ -267,7 +267,7 @@
  },
  {
   "description": "Load Data from local infile for mysql",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "local_infile",
@@ -281,7 +281,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "paypal_username",
@@ -295,7 +295,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_session_cache",
@@ -309,7 +309,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_password",
@@ -323,7 +323,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "always_use_account_email_id_as_sender",
@@ -337,7 +337,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_port",
@@ -351,7 +351,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "use_tls",
@@ -365,7 +365,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "skip_setup_wizard",
@@ -379,7 +379,7 @@
  },
  {
   "description": "",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "ignore_csrf",
@@ -393,7 +393,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_global_search",
@@ -407,7 +407,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_error_snapshot",
@@ -421,7 +421,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_username",
@@ -435,7 +435,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "deny_multiple_sessions",
@@ -449,7 +449,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "use_ssl",
@@ -463,7 +463,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_signature",
@@ -477,7 +477,7 @@
  },
  {
   "description": "for RazorPay Settings",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "converted_rupee_to_paisa",
@@ -491,7 +491,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "auto_email_id",
@@ -505,7 +505,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "host_name",
@@ -519,7 +519,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "always_use_account_name_as_sender_name",
@@ -533,7 +533,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "paypal_signature",
@@ -547,7 +547,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_website_cache",
@@ -561,7 +561,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "pop_timeout",
@@ -575,7 +575,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "data_import_batch_size",
@@ -589,7 +589,7 @@
  },
  {
   "description": "Key used to encrypt Passwords",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "encryption_key",
@@ -603,7 +603,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mute_emails",
@@ -617,7 +617,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 0,
   "key": "max_file_size",
@@ -631,7 +631,7 @@
  },
  {
   "description": "At FC, we use this to manage site usages.",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "rate_limit",
@@ -645,7 +645,7 @@
  },
  {
   "description": "We use this to suspend or deactivate sites in FC.",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "maintenance_mode",
@@ -659,7 +659,7 @@
  },
  {
   "description": "Maintains a list of domains for site",
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "domains",
@@ -673,7 +673,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_name",
@@ -687,7 +687,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_host",
@@ -701,7 +701,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_password",
@@ -715,7 +715,7 @@
  },
  {
   "description": null,
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_type",
diff --git a/jcloud/fixtures/site_config_key_blacklist.json b/jcloud/fixtures/site_config_key_blacklist.json
index 9cf9a7d..176db52 100644
--- a/jcloud/fixtures/site_config_key_blacklist.json
+++ b/jcloud/fixtures/site_config_key_blacklist.json
@@ -1,6 +1,6 @@
 [
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "ssl_certificate",
   "modified": "2020-10-01 21:10:07.925888",
@@ -8,7 +8,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "ssl_certificate_key",
   "modified": "2020-10-01 21:10:31.635305",
@@ -16,7 +16,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "jingrowcloud_url",
   "modified": "2020-09-15 13:02:11.917220",
@@ -24,7 +24,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_ssl_key",
   "modified": "2020-09-15 13:02:12.019502",
@@ -32,7 +32,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_password",
   "modified": "2020-09-15 13:02:12.032911",
@@ -40,7 +40,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "monitor",
   "modified": "2020-09-15 13:02:12.044695",
@@ -48,7 +48,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "root_login",
   "modified": "2020-09-15 14:47:30.453481",
@@ -56,7 +56,7 @@
   "reason": "only used at postgres setup_db #L41...else used as flags"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_port",
   "modified": "2020-09-15 13:02:12.066262",
@@ -64,7 +64,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "webserver_port",
   "modified": "2020-09-15 13:02:12.078783",
@@ -72,7 +72,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "restart_systemd_on_update",
   "modified": "2020-09-15 13:02:12.088768",
@@ -80,7 +80,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_name",
   "modified": "2020-09-15 13:02:12.098600",
@@ -88,7 +88,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_ssl_cert",
   "modified": "2020-09-15 13:02:12.111550",
@@ -96,7 +96,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_ssl_ca",
   "modified": "2020-09-15 13:02:12.121237",
@@ -104,7 +104,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "keep_backups_for_hours",
   "modified": "2020-09-15 14:48:35.698767",
@@ -112,7 +112,7 @@
   "reason": "retain backups while deleting old ones : BackupGenerator"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "socketio_port",
   "modified": "2020-09-15 13:02:12.142390",
@@ -120,7 +120,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_type",
   "modified": "2020-09-15 13:02:12.164240",
@@ -128,7 +128,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "db_host",
   "modified": "2020-09-15 13:02:12.173858",
@@ -136,7 +136,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "http_port",
   "modified": "2020-09-15 13:02:12.183172",
@@ -144,7 +144,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "developer_mode",
   "modified": "2020-09-15 13:02:12.202427",
@@ -152,7 +152,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "root_password",
   "modified": "2020-09-15 14:47:48.878756",
@@ -160,7 +160,7 @@
   "reason": "Used under mysql and postgres setup_db methods"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "allow_tests",
   "modified": "2020-09-15 13:02:12.228708",
@@ -168,7 +168,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "install_apps",
   "modified": "2020-09-15 14:48:13.132821",
@@ -176,7 +176,7 @@
   "reason": "apps to install at site creation"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "admin_password",
   "modified": "2020-09-15 13:02:12.250826",
@@ -184,7 +184,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "restart_supervisor_on_update",
   "modified": "2020-09-15 13:02:12.259476",
@@ -192,7 +192,7 @@
   "reason": null
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "rds_db",
   "modified": "2020-09-15 14:47:00.852841",
@@ -200,7 +200,7 @@
   "reason": "for only granting certain perms on databases. named because of AWS RDS?"
  },
  {
-  "docstatus": 0,
+  "pagestatus": 0,
   "pagetype": "Site Config Key Blacklist",
   "key": "rate_limit",
   "modified": "2020-09-18 11:54:37.058867",
diff --git a/jcloud/jcloud/audit.py b/jcloud/jcloud/audit.py
index b0a6bb1..ff99744 100644
--- a/jcloud/jcloud/audit.py
+++ b/jcloud/jcloud/audit.py
@@ -373,7 +373,7 @@ class BillingAudit(Audit):
 			SELECT subscription, Count(name) as count
 			FROM `tabUsage Record` as UR
 			WHERE UR.date = CURDATE()
-			AND UR.docstatus = 1
+			AND UR.pagestatus = 1
 			AND UR.plan NOT LIKE '%Marketplace%'
 			GROUP BY UR.document_name, UR.plan, UR.team
 			HAVING count > 1
@@ -440,7 +440,7 @@ class BillingAudit(Audit):
 				& (team.enabled == 1)
 				& (team.free_account == 0)
 				& (invoice.status == "Unpaid")
-				& (invoice.docstatus < 2)
+				& (invoice.pagestatus < 2)
 				& (invoice.type == "Subscription")
 				& (site.free == 0)
 				& (site.plan).notin(jingrow_plans)
diff --git a/jcloud/jcloud/custom/address.json b/jcloud/jcloud/custom/address.json
index 06b3346..af2b89a 100644
--- a/jcloud/jcloud/custom/address.json
+++ b/jcloud/jcloud/custom/address.json
@@ -15,7 +15,7 @@
    "default": null,
    "depends_on": null,
    "description": null,
-   "docstatus": 0,
+   "pagestatus": 0,
    "dt": "Address",
    "fetch_from": null,
    "fetch_if_empty": 0,
@@ -71,7 +71,7 @@
    "create": 1,
    "creation": "2013-01-10 16:34:32",
    "delete": 0,
-   "docstatus": 0,
+   "pagestatus": 0,
    "email": 1,
    "export": 0,
    "idx": 2,
@@ -104,7 +104,7 @@
    "create": 1,
    "creation": "2013-01-10 16:34:32",
    "delete": 1,
-   "docstatus": 0,
+   "pagestatus": 0,
    "email": 1,
    "export": 1,
    "idx": 5,
@@ -137,7 +137,7 @@
    "create": 1,
    "creation": "2013-01-10 16:34:32",
    "delete": 0,
-   "docstatus": 0,
+   "pagestatus": 0,
    "email": 1,
    "export": 0,
    "idx": 3,
@@ -170,7 +170,7 @@
    "create": 1,
    "creation": "2013-01-10 16:34:32",
    "delete": 0,
-   "docstatus": 0,
+   "pagestatus": 0,
    "email": 1,
    "export": 0,
    "idx": 1,
@@ -203,7 +203,7 @@
    "create": 1,
    "creation": "2013-01-10 16:34:32",
    "delete": 0,
-   "docstatus": 0,
+   "pagestatus": 0,
    "email": 1,
    "export": 0,
    "idx": 4,
@@ -236,7 +236,7 @@
    "create": 1,
    "creation": "2020-08-26 20:09:40.417634",
    "delete": 1,
-   "docstatus": 0,
+   "pagestatus": 0,
    "email": 0,
    "export": 1,
    "idx": 0,
diff --git a/jcloud/jcloud/custom/country.json b/jcloud/jcloud/custom/country.json
index a4da3d1..0c2828d 100644
--- a/jcloud/jcloud/custom/country.json
+++ b/jcloud/jcloud/custom/country.json
@@ -15,7 +15,7 @@
    "default": null,
    "depends_on": null,
    "description": null,
-   "docstatus": 0,
+   "pagestatus": 0,
    "dt": "Country",
    "fetch_from": null,
    "fetch_if_empty": 0,
diff --git a/jcloud/jcloud/pagetype/agent_job/test_agent_job.py b/jcloud/jcloud/pagetype/agent_job/test_agent_job.py
index 9cc535f..cc68285 100644
--- a/jcloud/jcloud/pagetype/agent_job/test_agent_job.py
+++ b/jcloud/jcloud/pagetype/agent_job/test_agent_job.py
@@ -161,7 +161,7 @@ def fake_agent_job(
 	):
 		jingrow.local.role_permissions = (
 			{}
-		)  # due to bug in FF related to only_if_creator docperm
+		)  # due to bug in FF related to only_if_creator pageperm
 		yield
 		global before_insert
 		before_insert = lambda self: None  # noqa
diff --git a/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py b/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py
index 315fa48..86e3aca 100644
--- a/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py
+++ b/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py
@@ -56,7 +56,7 @@ class BalanceTransaction(Document):
 
 		last_balance = jingrow.db.get_all(
 			"Balance Transaction",
-			filters={"team": self.team, "docstatus": 1, "type": ("!=", "Partnership Fee")},
+			filters={"team": self.team, "pagestatus": 1, "type": ("!=", "Partnership Fee")},
 			fields=["sum(amount) as ending_balance"],
 			group_by="team",
 			pluck="ending_balance",
@@ -96,7 +96,7 @@ class BalanceTransaction(Document):
 		remaining_amount = abs(self.amount)
 		transactions = jingrow.get_all(
 			"Balance Transaction",
-			filters={"docstatus": 1, "team": self.team, "unallocated_amount": (">", 0)},
+			filters={"pagestatus": 1, "team": self.team, "unallocated_amount": (">", 0)},
 			fields=["name", "unallocated_amount"],
 			order_by="creation asc",
 		)
@@ -123,7 +123,7 @@ class BalanceTransaction(Document):
 		unallocated_amounts = (
 			jingrow.get_all(
 				"Balance Transaction",
-				filters={"docstatus": 1, "team": self.team, "unallocated_amount": (">", 0)},
+				filters={"pagestatus": 1, "team": self.team, "unallocated_amount": (">", 0)},
 				fields=["unallocated_amount"],
 				pluck="unallocated_amount",
 			)
diff --git a/jcloud/jcloud/pagetype/invoice/invoice.js b/jcloud/jcloud/pagetype/invoice/invoice.js
index 31ed64b..9cce03a 100644
--- a/jcloud/jcloud/pagetype/invoice/invoice.js
+++ b/jcloud/jcloud/pagetype/invoice/invoice.js
@@ -126,7 +126,7 @@ jingrow.ui.form.on('Invoice', {
 			);
 		}
 
-		if (frm.pg.docstatus == 1 && frm.pg.stripe_invoice_id) {
+		if (frm.pg.pagestatus == 1 && frm.pg.stripe_invoice_id) {
 			let btn = frm.add_custom_button(
 				'Change Status',
 				() => {
@@ -159,7 +159,7 @@ jingrow.ui.form.on('Invoice', {
 			);
 		}
 
-		if (frm.pg.docstatus === 0) {
+		if (frm.pg.pagestatus === 0) {
 			let btn = frm.add_custom_button('Finalize Invoice', () =>
 				jingrow.confirm(
 					'This action will apply credits (if applicable) and generate a Stripe invoice if the amount due is greater than 0. ' +
diff --git a/jcloud/jcloud/pagetype/invoice/invoice.py b/jcloud/jcloud/pagetype/invoice/invoice.py
index ec55be1..0a32977 100644
--- a/jcloud/jcloud/pagetype/invoice/invoice.py
+++ b/jcloud/jcloud/pagetype/invoice/invoice.py
@@ -111,7 +111,7 @@ class Invoice(Document):
 		"partner_email",
 		"amount_due",
 		"amount_paid",
-		"docstatus",
+		"pagestatus",
 		"gst",
 		"applied_credits",
 		"status",
@@ -220,7 +220,7 @@ class Invoice(Document):
 			jingrow.throw("Invoice must be Paid to be submitted")
 
 	def calculate_values(self):
-		if self.status == "Paid" and self.docstatus == 1:
+		if self.status == "Paid" and self.pagestatus == 1:
 			# don't calculate if already invoice is paid and already submitted
 			return
 		self.calculate_total()
@@ -311,7 +311,7 @@ class Invoice(Document):
 					"status": "Unpaid",
 					"team": self.team,
 					"type": "Subscription",
-					"docstatus": ("<", 2),
+					"pagestatus": ("<", 2),
 				},
 			)
 			== 0
@@ -590,7 +590,7 @@ class Invoice(Document):
 		if self.type != "Subscription":
 			return
 		# return if invoice is not in draft mode
-		if self.docstatus != 0:
+		if self.pagestatus != 0:
 			return
 
 		# return if this usage_record is of a different invoice
@@ -679,7 +679,7 @@ class Invoice(Document):
 				"team": self.team,
 				"type": "Adjustment",
 				"unallocated_amount": (">", 0),
-				"docstatus": ("<", 2),
+				"pagestatus": ("<", 2),
 			},
 			fields=["name", "unallocated_amount", "source"],
 			order_by="creation desc",
diff --git a/jcloud/jcloud/pagetype/invoice/mark_as_uncollectible.py b/jcloud/jcloud/pagetype/invoice/mark_as_uncollectible.py
index 4febe15..0dd56cf 100644
--- a/jcloud/jcloud/pagetype/invoice/mark_as_uncollectible.py
+++ b/jcloud/jcloud/pagetype/invoice/mark_as_uncollectible.py
@@ -11,7 +11,7 @@ def execute():
 	six_months_ago = jingrow.utils.add_to_date(None, months=-6)
 	invoices = jingrow.db.get_all(
 		"Invoice",
-		filters={"due_date": ("<", six_months_ago), "status": "Unpaid", "docstatus": 0},
+		filters={"due_date": ("<", six_months_ago), "status": "Unpaid", "pagestatus": 0},
 	)
 
 	for inv in invoices:
diff --git a/jcloud/jcloud/pagetype/invoice/patches/set_free_credits.py b/jcloud/jcloud/pagetype/invoice/patches/set_free_credits.py
index 029cc6f..a9b8e40 100644
--- a/jcloud/jcloud/pagetype/invoice/patches/set_free_credits.py
+++ b/jcloud/jcloud/pagetype/invoice/patches/set_free_credits.py
@@ -10,7 +10,7 @@ def execute():
 	jingrow.reload_pg("jcloud", "pagetype", "invoice")
 	# only apply to invoices that has credits applied
 	invoices = jingrow.db.get_all(
-		"Invoice", {"docstatus": 1, "applied_credits": (">", 0)}, pluck="name"
+		"Invoice", {"pagestatus": 1, "applied_credits": (">", 0)}, pluck="name"
 	)
 
 	total_invoices = len(invoices)
diff --git a/jcloud/jcloud/pagetype/invoice/patches/set_transaction_details.py b/jcloud/jcloud/pagetype/invoice/patches/set_transaction_details.py
index 6e7c09a..8ea662a 100644
--- a/jcloud/jcloud/pagetype/invoice/patches/set_transaction_details.py
+++ b/jcloud/jcloud/pagetype/invoice/patches/set_transaction_details.py
@@ -9,7 +9,7 @@ def execute():
 	jingrow.reload_pg("jcloud", "pagetype", "invoice")
 	invoices = jingrow.db.get_all(
 		"Invoice",
-		{"status": "Paid", "docstatus": 1, "amount_paid": (">", 0), "transaction_amount": 0},
+		{"status": "Paid", "pagestatus": 1, "amount_paid": (">", 0), "transaction_amount": 0},
 		pluck="name",
 	)
 	for name in invoices:
diff --git a/jcloud/jcloud/pagetype/invoice/test_invoice.py b/jcloud/jcloud/pagetype/invoice/test_invoice.py
index d204cef..5948f79 100644
--- a/jcloud/jcloud/pagetype/invoice/test_invoice.py
+++ b/jcloud/jcloud/pagetype/invoice/test_invoice.py
@@ -443,7 +443,7 @@ class TestInvoice(unittest.TestCase):
 				"Balance Transaction",
 				filters={
 					"team": team.name,
-					"docstatus": 1,
+					"pagestatus": 1,
 					"unallocated_amount": (">=", 0),
 					"source": "Prepaid Credits",
 				},
@@ -473,7 +473,7 @@ class TestInvoice(unittest.TestCase):
 			bt.amount = -100
 			bt.source = "Transferred Credits"
 			bt.type = "Adjustment"
-			bt.docstatus = 1
+			bt.pagestatus = 1
 			bt.db_insert()
 
 			settling_transaction = team.allocate_credit_amount(200, source="Prepaid Credits")
diff --git a/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py b/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py
index 0427b80..d18cd66 100644
--- a/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py
+++ b/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py
@@ -200,14 +200,14 @@ class JcloudPermissionGroup(Document):
 			if updated_pagetype not in cur_permissions:
 				cur_permissions[updated_pagetype] = {}
 
-			for updated_docname, updated_docperms in updated_pagetype_perms.items():
+			for updated_docname, updated_pageperms in updated_pagetype_perms.items():
 				if updated_docname == "*":
-					cur_permissions[updated_pagetype] = {"*": updated_docperms}
+					cur_permissions[updated_pagetype] = {"*": updated_pageperms}
 					continue
 				if updated_docname not in cur_permissions[updated_pagetype]:
 					cur_permissions[updated_pagetype][updated_docname] = {}
 
-				for method, permitted in updated_docperms.items():
+				for method, permitted in updated_pageperms.items():
 					cur_permissions[updated_pagetype][updated_docname][method] = permitted
 
 		self.permissions = cur_permissions
diff --git a/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py b/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py
index 5eb4716..416eaf0 100644
--- a/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py
+++ b/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py
@@ -54,6 +54,6 @@ class MpesaPaymentRecord(Document):
 	def validate_duplicate(self):
 		if jingrow.db.exists(
 			"Mpesa Payment Record",
-			{"transaction_id": self.transaction_id, "docstatus": 1},
+			{"transaction_id": self.transaction_id, "pagestatus": 1},
 		):
 			jingrow.throw(f"Mpesa Payment Record for transaction {self.transaction_id} already exists")
diff --git a/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.js b/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.js
index c342f8b..69c65d5 100644
--- a/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.js
+++ b/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.js
@@ -3,7 +3,7 @@
 
 jingrow.ui.form.on('Partner Payment Payout', {
 	refresh(frm) {
-		if (frm.pg.docstatus == 0) {
+		if (frm.pg.pagestatus == 0) {
 			frm.add_custom_button('Fetch Payments', () => {
 				jingrow.call({
 					method: 'jcloud.api.local_payments.mpesa.utils.fetch_payments',
diff --git a/jcloud/jcloud/pagetype/payout_order/patches/compute_total_amount.py b/jcloud/jcloud/pagetype/payout_order/patches/compute_total_amount.py
index c14e1f0..24769e0 100644
--- a/jcloud/jcloud/pagetype/payout_order/patches/compute_total_amount.py
+++ b/jcloud/jcloud/pagetype/payout_order/patches/compute_total_amount.py
@@ -9,7 +9,7 @@ def execute():
 	exchange_rate = jingrow.db.get_single_value("Jcloud Settings", "usd_rate")
 	payout_orders = jingrow.get_all(
 		"Payout Order",
-		{"docstatus": 0},
+		{"pagestatus": 0},
 		["name", "net_total_cny", "net_total_usd", "recipient_currency"],
 	)
 
diff --git a/jcloud/jcloud/pagetype/payout_order/payout_order.py b/jcloud/jcloud/pagetype/payout_order/payout_order.py
index a0841c1..3329e3b 100644
--- a/jcloud/jcloud/pagetype/payout_order/payout_order.py
+++ b/jcloud/jcloud/pagetype/payout_order/payout_order.py
@@ -57,7 +57,7 @@ class PayoutOrder(Document):
 	@staticmethod
 	def get_list_query(query):
 		PayoutOrder = jingrow.qb.PageType("Payout Order")
-		query = query.where((PayoutOrder.docstatus != 2))
+		query = query.where((PayoutOrder.pagestatus != 2))
 		return query
 
 	def validate(self):
diff --git a/jcloud/jcloud/pagetype/site/site.py b/jcloud/jcloud/pagetype/site/site.py
index aa8f35f..6361d3e 100644
--- a/jcloud/jcloud/pagetype/site/site.py
+++ b/jcloud/jcloud/pagetype/site/site.py
@@ -100,7 +100,7 @@ if TYPE_CHECKING:
 	from jcloud.jcloud.pagetype.release_group.release_group import ReleaseGroup
 	from jcloud.jcloud.pagetype.server.server import BaseServer, Server
 
-DOCTYPE_SERVER_TYPE_MAP = {
+PAGETYPE_SERVER_TYPE_MAP = {
 	"Server": "Application",
 	"Database Server": "Database",
 	"Proxy Server": "Proxy",
@@ -788,7 +788,7 @@ class Site(Document, TagHelpers):
 		mountpoint = server.guess_data_disk_mountpoint()
 		free_space = server.free_space(mountpoint)
 		if (diff := free_space - space_required) <= 0:
-			msg = f"Insufficient estimated space on {DOCTYPE_SERVER_TYPE_MAP[server.pagetype]} server to create site. Required: {human_readable(space_required)}, Available: {human_readable(free_space)} (Need {human_readable(abs(diff))})."
+			msg = f"Insufficient estimated space on {PAGETYPE_SERVER_TYPE_MAP[server.pagetype]} server to create site. Required: {human_readable(space_required)}, Available: {human_readable(free_space)} (Need {human_readable(abs(diff))})."
 			if server.public:
 				self.try_increasing_disk(server, mountpoint, diff, msg)
 			else:
diff --git a/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py b/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py
index 9f8932e..4afa126 100644
--- a/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py
+++ b/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py
@@ -99,7 +99,7 @@ class StripePaymentEvent(Document):
 					"team": team.name,
 					"status": "Unpaid",
 					"type": "Subscription",
-					"docstatus": ("<", 2),
+					"pagestatus": ("<", 2),
 				},
 			)
 			== 0
diff --git a/jcloud/jcloud/pagetype/team/suspend_sites.py b/jcloud/jcloud/pagetype/team/suspend_sites.py
index 1c45643..3835461 100644
--- a/jcloud/jcloud/pagetype/team/suspend_sites.py
+++ b/jcloud/jcloud/pagetype/team/suspend_sites.py
@@ -91,7 +91,7 @@ def get_teams_with_unpaid_invoices():
 			& (team.enabled == 1)
 			& (team.free_account == 0)
 			& (invoice.status == "Unpaid")
-			& (invoice.docstatus < 2)
+			& (invoice.pagestatus < 2)
 			& (invoice.type == "Subscription")
 			& (site.free == 0)
 			& (site.plan).notin(jingrow_plans)
diff --git a/jcloud/jcloud/pagetype/team/team.py b/jcloud/jcloud/pagetype/team/team.py
index 5684404..a5b4f86 100644
--- a/jcloud/jcloud/pagetype/team/team.py
+++ b/jcloud/jcloud/pagetype/team/team.py
@@ -461,7 +461,7 @@ class Team(Document):
 	def update_draft_invoice_payment_mode(self):
 		if self.has_value_changed("payment_mode"):
 			draft_invoices = jingrow.get_all(
-				"Invoice", filters={"docstatus": 0, "team": self.name}, pluck="name"
+				"Invoice", filters={"pagestatus": 0, "team": self.name}, pluck="name"
 			)
 
 			for invoice in draft_invoices:
@@ -520,7 +520,7 @@ class Team(Document):
 		to track the partner achievements
 		"""
 		# check if any active user with an invoice
-		if not jingrow.get_all("Invoice", {"team": self.name, "docstatus": ("<", 2)}, pluck="name"):
+		if not jingrow.get_all("Invoice", {"team": self.name, "pagestatus": ("<", 2)}, pluck="name"):
 			return
 		today = jingrow.utils.getdate()
 		current_invoice = jingrow.db.get_value(
@@ -528,7 +528,7 @@ class Team(Document):
 			{
 				"team": self.name,
 				"type": "Subscription",
-				"docstatus": 0,
+				"pagestatus": 0,
 				"period_end": jingrow.utils.get_last_day(today),
 			},
 			"name",
@@ -586,7 +586,7 @@ class Team(Document):
 				{
 					"status": "Unpaid",
 					"team": self.name,
-					"docstatus": ("<", 2),
+					"pagestatus": ("<", 2),
 					"type": "Subscription",
 				},
 				pluck="name",
@@ -644,7 +644,7 @@ class Team(Document):
 		self.update_billing_details_on_draft_invoices()
 
 	def update_billing_details_on_draft_invoices(self):
-		draft_invoices = jingrow.get_all("Invoice", {"team": self.name, "docstatus": 0}, pluck="name")
+		draft_invoices = jingrow.get_all("Invoice", {"team": self.name, "pagestatus": 0}, pluck="name")
 		for draft_invoice in draft_invoices:
 			# Invoice.customer_name set by Invoice.validate()
 			jingrow.get_pg("Invoice", draft_invoice).save()
@@ -710,7 +710,7 @@ class Team(Document):
 			filters={
 				"team": self.name,
 				"status": ("not in", ("Draft", "Refunded")),
-				"docstatus": ("!=", 2),
+				"pagestatus": ("!=", 2),
 			},
 			fields=[
 				"name",
@@ -815,7 +815,7 @@ class Team(Document):
 	def get_balance(self):
 		res = jingrow.get_all(
 			"Balance Transaction",
-			filters={"team": self.name, "docstatus": 1, "type": ("!=", "Partnership Fee")},
+			filters={"team": self.name, "pagestatus": 1, "type": ("!=", "Partnership Fee")},
 			order_by="creation desc",
 			limit=1,
 			pluck="ending_balance",
diff --git a/jcloud/jcloud/pagetype/team_deletion_request/team_deletion_request.py b/jcloud/jcloud/pagetype/team_deletion_request/team_deletion_request.py
index 3093569..bd94499 100644
--- a/jcloud/jcloud/pagetype/team_deletion_request/team_deletion_request.py
+++ b/jcloud/jcloud/pagetype/team_deletion_request/team_deletion_request.py
@@ -268,7 +268,7 @@ class TeamDeletionRequest(PersonalDataDeletionRequest):
 		pending_invoices = jingrow.get_all(
 			"Invoice",
 			filters={"team": self.team},
-			or_filters={"docstatus": 0, "status": "Draft"},
+			or_filters={"pagestatus": 0, "status": "Draft"},
 			pluck="name",
 		)
 		for invoice in pending_invoices:
diff --git a/jcloud/jcloud/pagetype/usage_record/usage_record.py b/jcloud/jcloud/pagetype/usage_record/usage_record.py
index 0da8c08..622a632 100644
--- a/jcloud/jcloud/pagetype/usage_record/usage_record.py
+++ b/jcloud/jcloud/pagetype/usage_record/usage_record.py
@@ -85,7 +85,7 @@ class UsageRecord(Document):
 				"interval": self.interval,
 				"date": self.date,
 				"plan": self.plan,
-				"docstatus": 1,
+				"pagestatus": 1,
 				"subscription": self.subscription,
 			},
 			pluck="name",
@@ -110,7 +110,7 @@ def link_unlinked_usage_records():
 			"invoice": ("is", "not set"),
 			"date": ("between", (fd, ld)),
 			"team": ("not in", free_teams),
-			"docstatus": 1,
+			"pagestatus": 1,
 		},
 		pluck="name",
 		ignore_ifnull=True,
diff --git a/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.js b/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.js
index bc2e965..cb73c68 100644
--- a/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.js
+++ b/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.js
@@ -8,7 +8,7 @@ jingrow.ui.form.on('User SSH Certificate', {
 				filters: { user: frm.pg.user },
 			};
 		});
-		if (frm.pg.docstatus === 1) {
+		if (frm.pg.pagestatus === 1) {
 			let key_type = frm.pg.ssh_public_key.split(' ')[0].split('-')[1];
 			frm.add_custom_button('Copy Certificate Details', function () {
 				let text = `echo '${frm.pg.ssh_certificate.trim()}' > ~/.ssh/id_${key_type}-cert.pub`;
diff --git a/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py b/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py
index 3616d95..05b094c 100644
--- a/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py
+++ b/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py
@@ -60,7 +60,7 @@ class UserSSHCertificate(Document):
 				"valid_until": [">", jingrow.utils.now()],
 				"access_server": self.access_server,
 				"all_servers": self.all_servers,
-				"docstatus": 1,
+				"pagestatus": 1,
 			},
 		):
 			jingrow.throw("A valid certificate already exists.")
diff --git a/jcloud/jcloud/report/agent_versions/agent_versions.json b/jcloud/jcloud/report/agent_versions/agent_versions.json
index 713ae8b..f2eaf30 100644
--- a/jcloud/jcloud/report/agent_versions/agent_versions.json
+++ b/jcloud/jcloud/report/agent_versions/agent_versions.json
@@ -3,7 +3,7 @@
  "columns": [],
  "creation": "2023-01-30 17:16:09.288587",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [
   {
diff --git a/jcloud/jcloud/report/aws_instance_pricing/aws_instance_pricing.json b/jcloud/jcloud/report/aws_instance_pricing/aws_instance_pricing.json
index 9d47f07..6c07147 100644
--- a/jcloud/jcloud/report/aws_instance_pricing/aws_instance_pricing.json
+++ b/jcloud/jcloud/report/aws_instance_pricing/aws_instance_pricing.json
@@ -101,7 +101,7 @@
  ],
  "creation": "2022-09-19 17:12:10.701432",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [
   {
diff --git a/jcloud/jcloud/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json b/jcloud/jcloud/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json
index 449abf0..3b60d59 100644
--- a/jcloud/jcloud/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json
+++ b/jcloud/jcloud/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json
@@ -132,7 +132,7 @@
  ],
  "creation": "2024-09-10 15:22:38.545636",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [
   {
diff --git a/jcloud/jcloud/report/bench_memory_limits/bench_memory_limits.json b/jcloud/jcloud/report/bench_memory_limits/bench_memory_limits.json
index 80078ef..2428a3d 100644
--- a/jcloud/jcloud/report/bench_memory_limits/bench_memory_limits.json
+++ b/jcloud/jcloud/report/bench_memory_limits/bench_memory_limits.json
@@ -3,7 +3,7 @@
  "columns": [],
  "creation": "2023-10-17 19:23:39.391050",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [
   {
diff --git a/jcloud/jcloud/report/binary_log_browser/binary_log_browser.json b/jcloud/jcloud/report/binary_log_browser/binary_log_browser.json
index be4d1d6..b43b9fa 100644
--- a/jcloud/jcloud/report/binary_log_browser/binary_log_browser.json
+++ b/jcloud/jcloud/report/binary_log_browser/binary_log_browser.json
@@ -4,7 +4,7 @@
  "creation": "2021-10-13 16:36:50.690799",
  "disable_prepared_report": 0,
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [],
  "idx": 0,
diff --git a/jcloud/jcloud/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json b/jcloud/jcloud/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json
index 99245c5..ee454f8 100644
--- a/jcloud/jcloud/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json
+++ b/jcloud/jcloud/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json
@@ -3,7 +3,7 @@
  "columns": [],
  "creation": "2023-05-18 21:37:22.195557",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [],
  "idx": 0,
diff --git a/jcloud/jcloud/report/mariadb_locks_list/mariadb_locks_list.json b/jcloud/jcloud/report/mariadb_locks_list/mariadb_locks_list.json
index d33736c..56c7fe8 100644
--- a/jcloud/jcloud/report/mariadb_locks_list/mariadb_locks_list.json
+++ b/jcloud/jcloud/report/mariadb_locks_list/mariadb_locks_list.json
@@ -3,7 +3,7 @@
  "columns": [],
  "creation": "2024-03-24 11:50:26.510957",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [
   {
diff --git a/jcloud/jcloud/report/mariadb_process_list/mariadb_process_list.json b/jcloud/jcloud/report/mariadb_process_list/mariadb_process_list.json
index 86a7cf0..ae30849 100644
--- a/jcloud/jcloud/report/mariadb_process_list/mariadb_process_list.json
+++ b/jcloud/jcloud/report/mariadb_process_list/mariadb_process_list.json
@@ -4,7 +4,7 @@
  "creation": "2022-04-27 21:05:57.049047",
  "disable_prepared_report": 0,
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [
   {
diff --git a/jcloud/jcloud/report/mariadb_slow_queries/mariadb_slow_queries.json b/jcloud/jcloud/report/mariadb_slow_queries/mariadb_slow_queries.json
index 7938f54..864bb99 100644
--- a/jcloud/jcloud/report/mariadb_slow_queries/mariadb_slow_queries.json
+++ b/jcloud/jcloud/report/mariadb_slow_queries/mariadb_slow_queries.json
@@ -3,7 +3,7 @@
  "columns": [],
  "creation": "2024-12-23 11:36:40.301426",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [],
  "idx": 0,
diff --git a/jcloud/jcloud/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json b/jcloud/jcloud/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json
index 5b7bdc7..beec6ca 100644
--- a/jcloud/jcloud/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json
+++ b/jcloud/jcloud/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json
@@ -3,7 +3,7 @@
  "columns": [],
  "creation": "2025-01-21 17:35:11.471086",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [],
  "idx": 0,
diff --git a/jcloud/jcloud/report/server_stats/server_stats.json b/jcloud/jcloud/report/server_stats/server_stats.json
index 6f506b6..ab396a9 100644
--- a/jcloud/jcloud/report/server_stats/server_stats.json
+++ b/jcloud/jcloud/report/server_stats/server_stats.json
@@ -3,7 +3,7 @@
  "columns": [],
  "creation": "2022-12-15 09:04:10.284944",
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [
   {
diff --git a/jcloud/jcloud/report/shared_app_server_stats/shared_app_server_stats.json b/jcloud/jcloud/report/shared_app_server_stats/shared_app_server_stats.json
index d148c78..c055530 100644
--- a/jcloud/jcloud/report/shared_app_server_stats/shared_app_server_stats.json
+++ b/jcloud/jcloud/report/shared_app_server_stats/shared_app_server_stats.json
@@ -4,7 +4,7 @@
  "creation": "2023-01-23 10:44:06.770366",
  "disable_prepared_report": 1,
  "disabled": 0,
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Report",
  "filters": [],
  "idx": 0,
diff --git a/jcloud/jcloud/workspace/jcloud/jcloud.json b/jcloud/jcloud/workspace/jcloud/jcloud.json
index c86da4f..9befc64 100644
--- a/jcloud/jcloud/workspace/jcloud/jcloud.json
+++ b/jcloud/jcloud/workspace/jcloud/jcloud.json
@@ -3,7 +3,7 @@
  "content": "[{\"id\":\"zYUVFJZX-t\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\">Jingrow</span>\",\"col\":12}},{\"id\":\"VFzeFzlnB5\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"iNJ8WoS9kD\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Sites</b></span>\",\"col\":12}},{\"id\":\"EYeJrbXv1P\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Active Sites\",\"col\":3}},{\"id\":\"7jAM0HBrde\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Broken Sites\",\"col\":3}},{\"id\":\"ttO5vXfzL_\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pending Sites\",\"col\":3}},{\"id\":\"nvLoQ_N15n\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Suspended Sites\",\"col\":3}},{\"id\":\"AVO8JCkksy\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"aLqo1uNPYu\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Benches</b></span>\",\"col\":12}},{\"id\":\"BcJPVEkRcy\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Active Benches\",\"col\":3}},{\"id\":\"PhHBf-f1ej\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Broken Benches\",\"col\":3}},{\"id\":\"JJB6cOEiXy\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"7a18ugroq8\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Servers</b></span>\",\"col\":12}},{\"id\":\"M3urSE6cor\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Application Server\",\"col\":3}},{\"id\":\"5qOJXl1CkE\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Database Server\",\"col\":3}},{\"id\":\"PWrCW7DruI\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Proxy Server\",\"col\":3}},{\"id\":\"_GVOmg7C_U\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Hybrid Servers\",\"col\":3}},{\"id\":\"XHWA0NCImO\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"X1dteEUHoR\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Settings</b></span>\",\"col\":12}},{\"id\":\"eeEbYjVj_n\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Jcloud Settings\",\"col\":3}},{\"id\":\"EiWS2tWYwu\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Root Domain\",\"col\":3}},{\"id\":\"EoLO5YYzdR\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Tls Certificate\",\"col\":3}},{\"id\":\"-Jx1Irf-28\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Team\",\"col\":3}},{\"id\":\"n-T0ehr2ca\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"xZEclbenJQ\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Masters</b></span>\",\"col\":12}},{\"id\":\"P6nCUrJreH\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App\",\"col\":3}},{\"id\":\"1kAyHtrIrJ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App Source\",\"col\":3}},{\"id\":\"-N-Xb5MVPV\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App Release\",\"col\":3}},{\"id\":\"ND9oElFB7R\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"0DYlbnEtOT\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Subscription</b></span>\",\"col\":12}},{\"id\":\"eddRzzqwSZ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Plan\",\"col\":3}},{\"id\":\"GYk3Frsy1L\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Site Plan\",\"col\":3}},{\"id\":\"o_aDSbQlPf\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Subscription\",\"col\":3}},{\"id\":\"VZSHmE1jzA\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Invoice\",\"col\":3}},{\"id\":\"B8T-3IZ8Qg\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"WDyzNHuOas\",\"type\":\"header\",\"data\":{\"text\":\"<span class=\\\"h4\\\"><b>Operations</b></span>\",\"col\":12}},{\"id\":\"Ziby8rOfsU\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Agent Job\",\"col\":3}},{\"id\":\"Vm4Tn0dxiD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Ansible Play\",\"col\":3}},{\"id\":\"n6VE51hPkc\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Jcloud Job\",\"col\":3}}]",
  "creation": "2024-07-30 18:43:18.421196",
  "custom_blocks": [],
- "docstatus": 0,
+ "pagestatus": 0,
  "pagetype": "Workspace",
  "for_user": "",
  "hide_custom": 0,
diff --git a/jcloud/patches/v0_0_1/create_invoice_for_past_ples.py b/jcloud/patches/v0_0_1/create_invoice_for_past_ples.py
index cd98872..acfb6bc 100644
--- a/jcloud/patches/v0_0_1/create_invoice_for_past_ples.py
+++ b/jcloud/patches/v0_0_1/create_invoice_for_past_ples.py
@@ -99,7 +99,7 @@ def create_past_invoices(team):
 				"creation": ("between", [i.period_start, i.period_end]),
 				"purpose": "Site Consumption",
 				"team": team.name,
-				"docstatus": 1,
+				"pagestatus": 1,
 				"free_usage": False,
 			},
 		)
@@ -117,7 +117,7 @@ def create_past_invoices(team):
 				stripe_invoice=invoice["id"],
 				message="total_match_success",
 			)
-			i.db_set("docstatus", 1)
+			i.db_set("pagestatus", 1)
 		else:
 			log(
 				team.name,
@@ -145,7 +145,7 @@ def create_draft_invoice(team, last_invoice_period_end=None):
 			"creation": ("between", [invoice.period_start, invoice.period_end]),
 			"purpose": "Site Consumption",
 			"team": team,
-			"docstatus": 1,
+			"pagestatus": 1,
 			"free_usage": False,
 		},
 	)
diff --git a/jcloud/patches/v0_0_1/ple_to_usage_record.py b/jcloud/patches/v0_0_1/ple_to_usage_record.py
index 905c7d4..066aa1a 100644
--- a/jcloud/patches/v0_0_1/ple_to_usage_record.py
+++ b/jcloud/patches/v0_0_1/ple_to_usage_record.py
@@ -27,7 +27,7 @@ def execute():
 				`interval`,
 				`invoice`,
 				`remark`,
-				`docstatus`
+				`pagestatus`
 			)
 		select
 			CONCAT('UT', SUBSTR(ple.name, 4)),
@@ -50,7 +50,7 @@ def execute():
 			`tabPayment Ledger Entry` ple
 		where
 			ple.purpose = 'Site Consumption'
-			and ple.docstatus = 1
+			and ple.pagestatus = 1
 			and ple.free_usage = 0
 	"""
 	)