mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-13 02:01:21 +00:00
* chore: cleanup doctype descriptions (#39637)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 6b8f046fb4)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/fiscal_year/fiscal_year.json
# erpnext/stock/doctype/item_price/item_price.json
# erpnext/stock/doctype/stock_settings/stock_settings.json
* chore: fix conflicts
---------
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
"allow_rename": 1,
|
||||
"autoname": "field:item_group_name",
|
||||
"creation": "2013-03-28 10:35:29",
|
||||
"description": "Item Classification",
|
||||
"description": "An Item Group is a way to classify items based on types.",
|
||||
"doctype": "DocType",
|
||||
"document_type": "Setup",
|
||||
"engine": "InnoDB",
|
||||
@@ -135,7 +135,7 @@
|
||||
"is_tree": 1,
|
||||
"links": [],
|
||||
"max_attachments": 3,
|
||||
"modified": "2023-10-12 13:44:13.611287",
|
||||
"modified": "2024-01-30 14:08:38.485616",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Setup",
|
||||
"name": "Item Group",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"allow_rename": 1,
|
||||
"autoname": "field:sales_person_name",
|
||||
"creation": "2013-01-10 16:34:24",
|
||||
"description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.",
|
||||
"description": "All Sales Transactions can be tagged against multiple Sales Persons so that you can set and monitor targets.",
|
||||
"doctype": "DocType",
|
||||
"document_type": "Setup",
|
||||
"engine": "InnoDB",
|
||||
@@ -145,10 +145,11 @@
|
||||
"idx": 1,
|
||||
"is_tree": 1,
|
||||
"links": [],
|
||||
"modified": "2020-03-18 18:11:13.968024",
|
||||
"modified": "2024-01-30 13:57:26.436991",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Setup",
|
||||
"name": "Sales Person",
|
||||
"naming_rule": "By fieldname",
|
||||
"nsm_parent_field": "parent_sales_person",
|
||||
"owner": "Administrator",
|
||||
"permissions": [
|
||||
@@ -181,5 +182,6 @@
|
||||
"search_fields": "parent_sales_person",
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "ASC"
|
||||
"sort_order": "ASC",
|
||||
"states": []
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
"allow_rename": 1,
|
||||
"autoname": "field:title",
|
||||
"creation": "2013-01-10 16:34:24",
|
||||
"description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.",
|
||||
"description": "Standard Terms and Conditions that can be added to Sales and Purchases. Examples: Validity of the offer, Payment Terms, Safety and Usage, etc.",
|
||||
"doctype": "DocType",
|
||||
"document_type": "Setup",
|
||||
"engine": "InnoDB",
|
||||
@@ -77,7 +77,7 @@
|
||||
"icon": "icon-legal",
|
||||
"idx": 1,
|
||||
"links": [],
|
||||
"modified": "2023-02-01 14:33:39.246532",
|
||||
"modified": "2024-01-30 12:47:52.325531",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Setup",
|
||||
"name": "Terms and Conditions",
|
||||
|
||||
Reference in New Issue
Block a user