nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 05:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: better description for advance account

Browse Source 
(cherry picked from commit de9c8fc9d6)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#	erpnext/setup/doctype/company/company.json
This commit is contained in:
ruthra kumar
2024-04-23 12:08:07 +05:30
committed by Mergify
parent 8591a151de
commit ed5affe25a
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
View File

@@ -195,6 +195,8 @@
}, },
{ {
"depends_on": "eval:doc.party", "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", "fieldname": "default_advance_account",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Default Advance Account", "label": "Default Advance Account",
@@ -229,7 +231,11 @@
"is_virtual": 1, "is_virtual": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-12-14 13:38:16.264013", "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", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation", "name": "Payment Reconciliation",

8
erpnext/setup/doctype/company/company.json
View File

@@ -707,6 +707,8 @@
}, },
{ {
"depends_on": "eval:doc.book_advance_payments_in_separate_party_account", "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", "fieldname": "default_advance_received_account",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Default Advance Received Account", "label": "Default Advance Received Account",
@@ -715,6 +717,8 @@
}, },
{ {
"depends_on": "eval:doc.book_advance_payments_in_separate_party_account", "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", "fieldname": "default_advance_paid_account",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Default Advance Paid Account", "label": "Default Advance Paid Account",
@@ -782,7 +786,11 @@
"image_field": "company_logo", "image_field": "company_logo",
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-09-10 21:53:13.860791", "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", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",

2
erpnext/setup/doctype/company/company.py
View File

@@ -35,7 +35,7 @@ class Company(NestedSet):
auto_exchange_rate_revaluation: DF.Check auto_exchange_rate_revaluation: DF.Check
book_advance_payments_in_separate_party_account: DF.Check book_advance_payments_in_separate_party_account: DF.Check
capital_work_in_progress_account: DF.Link | None 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_description: DF.TextEditor | None
company_logo: DF.AttachImage | None company_logo: DF.AttachImage | None
company_name: DF.Data company_name: DF.Data