diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index 666926f00eb..9ceafd21bd9 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -195,6 +195,8 @@
   },
   {
    "depends_on": "eval:doc.party",
+   "description": "Only 'Payment Entries' made against this advance account are supported.",
+   "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/advance-in-separate-party-account",
    "fieldname": "default_advance_account",
    "fieldtype": "Link",
    "label": "Default Advance Account",
@@ -229,7 +231,11 @@
  "is_virtual": 1,
  "issingle": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-12-14 13:38:16.264013",
+=======
+ "modified": "2024-04-23 12:38:29.557315",
+>>>>>>> de9c8fc9d6 (refactor: better description for advance account)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation",
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 24d7da45b84..59c53c73b84 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -707,6 +707,8 @@
   },
   {
    "depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
+   "description": "Only 'Payment Entries' made against this advance account are supported.",
+   "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/advance-in-separate-party-account",
    "fieldname": "default_advance_received_account",
    "fieldtype": "Link",
    "label": "Default Advance Received Account",
@@ -715,6 +717,8 @@
   },
   {
    "depends_on": "eval:doc.book_advance_payments_in_separate_party_account",
+   "description": "Only 'Payment Entries' made against this advance account are supported.",
+   "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/advance-in-separate-party-account",
    "fieldname": "default_advance_paid_account",
    "fieldtype": "Link",
    "label": "Default Advance Paid Account",
@@ -782,7 +786,11 @@
  "image_field": "company_logo",
  "is_tree": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-09-10 21:53:13.860791",
+=======
+ "modified": "2024-04-23 12:38:33.173938",
+>>>>>>> de9c8fc9d6 (refactor: better description for advance account)
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Company",
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 7181e90139e..3523cac822e 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -35,7 +35,7 @@ class Company(NestedSet):
 		auto_exchange_rate_revaluation: DF.Check
 		book_advance_payments_in_separate_party_account: DF.Check
 		capital_work_in_progress_account: DF.Link | None
-		chart_of_accounts: DF.Literal
+		chart_of_accounts: DF.Literal[None]
 		company_description: DF.TextEditor | None
 		company_logo: DF.AttachImage | None
 		company_name: DF.Data