diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 6df54e4e8ccc7def2587621de87afb405d72a74a..b85055f4a2cc1078fff32fe617237e5e38e0ac57 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -1,7 +1,6 @@ { "actions": [], "creation": "2013-06-24 15:49:57", - "description": "Settings for Accounts", "doctype": "DocType", "document_type": "Other", "editable_grid": 1, @@ -482,7 +481,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-01-22 12:10:10.151819", + "modified": "2024-01-30 14:04:26.553554", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings", diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json index 58c927b09ac036eea0fe5e29c2f90b0cb8b84cb8..7d2889acf7da4e7f9dd2b5df716b722166d689a3 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json @@ -3,7 +3,7 @@ "allow_import": 1, "autoname": "field:year", "creation": "2013-01-22 16:50:25", - "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", + "description": "Represents a Financial Year. All accounting entries and other major transactions are tracked against the Fiscal Year.", "doctype": "DocType", "document_type": "Setup", "engine": "InnoDB", @@ -71,10 +71,11 @@ "icon": "fa fa-calendar", "idx": 1, "links": [], - "modified": "2024-01-17 13:06:01.608953", + "modified": "2024-01-30 12:35:38.645968", "modified_by": "Administrator", "module": "Accounts", "name": "Fiscal Year", + "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ { diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json index c84387c9a9c5ebbf32869e27482f74dd5815198c..c0fdf9c9f6817265639ff0db77603ebed852b6a1 100644 --- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json +++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json @@ -2,7 +2,7 @@ "actions": [], "autoname": "field:distribution_id", "creation": "2013-01-10 16:34:05", - "description": "**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.", + "description": "Helps you distribute the Budget/Target across months if you have seasonality in your business.", "doctype": "DocType", "engine": "InnoDB", "field_order": [ @@ -43,14 +43,14 @@ "options": "Monthly Distribution Percentage" } ], - "icon": "fa fa-chart-bar", + "icon": "fa fa-bar-chart", "idx": 1, "links": [], - "modified": "2022-08-03 15:51:08.194280", + "modified": "2024-01-30 13:57:55.802744", "modified_by": "Administrator", "module": "Accounts", "name": "Monthly Distribution", - "name_case": "Title Case", + "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ { @@ -74,4 +74,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json index 9c829b5062401edcc8cbdcc20eda68ab43affddf..1c8d56088ec3e6442e195fd3182468986decf6be 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json @@ -3,7 +3,7 @@ "allow_import": 1, "allow_rename": 1, "creation": "2013-01-10 16:34:08", - "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", + "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain a list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\", etc.", "doctype": "DocType", "document_type": "Setup", "engine": "InnoDB", @@ -77,7 +77,7 @@ "icon": "uil uil-money-bill", "idx": 1, "links": [], - "modified": "2023-02-20 16:33:50.446725", + "modified": "2024-01-30 13:08:09.537242", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Taxes and Charges Template", diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json index f7cd827f6d408a4098e0c2db50273242b14fe0c6..f05ee1eb16210510f3422cb3879f5c700d1f26e6 100644 --- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json +++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json @@ -3,7 +3,7 @@ "allow_import": 1, "allow_rename": 1, "creation": "2013-01-10 16:34:09", - "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", + "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain a list of tax heads and also other expense/income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.", "doctype": "DocType", "document_type": "Setup", "engine": "InnoDB", @@ -80,7 +80,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2023-12-08 16:03:01.935070", + "modified": "2024-01-30 13:07:28.801104", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Taxes and Charges Template", diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json index 7b7619aaeca124bb396edd4d65227ae3050d46b2..65ac7e002bc558e41b6f99e1b6c7223222a5ccd0 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.json +++ b/erpnext/buying/doctype/buying_settings/buying_settings.json @@ -1,7 +1,6 @@ { "actions": [], "creation": "2013-06-25 11:04:03", - "description": "Settings for Buying Module", "doctype": "DocType", "document_type": "Other", "engine": "InnoDB", diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json index 84fb87529aa754e35d7796b69c8bd9e941b4f307..358f2ceaeaf8bc69a2c553a831a4ff392c527638 100644 --- a/erpnext/selling/doctype/product_bundle/product_bundle.json +++ b/erpnext/selling/doctype/product_bundle/product_bundle.json @@ -2,7 +2,7 @@ "actions": [], "allow_import": 1, "creation": "2013-06-20 11:53:21", - "description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.\n\nNote: BOM = Bill of Materials", + "description": "Aggregate a group of Items into another Item. This is useful if you are maintaining the stock of the packed items and not the bundled item", "doctype": "DocType", "engine": "InnoDB", "field_order": [ @@ -77,7 +77,7 @@ "icon": "fa fa-sitemap", "idx": 1, "links": [], - "modified": "2023-12-08 16:03:01.935070", + "modified": "2024-01-30 13:57:04.951788", "modified_by": "Administrator", "module": "Selling", "name": "Product Bundle", diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json index 2c46e6fbeeb97407e9e7cd6a00d9585b74d073d0..5ffa600a251e2a60c7e368362ab5d6ea5968bf63 100644 --- a/erpnext/setup/doctype/item_group/item_group.json +++ b/erpnext/setup/doctype/item_group/item_group.json @@ -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-16 22:27:48.382985", + "modified": "2024-01-30 14:08:38.485616", "modified_by": "Administrator", "module": "Setup", "name": "Item Group", diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json index aa4912550b3c09a6293df8b1bea4a78715a036ef..f68226aac798f0ab6a2972f529b5c7b03b42b15f 100644 --- a/erpnext/setup/doctype/sales_person/sales_person.json +++ b/erpnext/setup/doctype/sales_person/sales_person.json @@ -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": "2023-12-08 16:03:01.935070", + "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": [ @@ -183,6 +184,6 @@ "show_name_in_global_search": 1, "show_preview_popup": 1, "sort_field": "modified", - "sort_order": "DESC", + "sort_order": "ASC", "states": [] } diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json index 9a5d38ebd7d1014be60c16b89e4b167b1f80c1e3..2cf7215b8cc8df43e648eb7e47a4334b030a4d4d 100644 --- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json +++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json @@ -1,138 +1,140 @@ { - "allow_import": 1, - "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.", - "doctype": "DocType", - "document_type": "Setup", - "engine": "InnoDB", - "field_order": [ - "title", - "disabled", - "applicable_modules_section", - "selling", - "buying", - "section_break_7", - "terms", - "terms_and_conditions_help" - ], - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "label": "Title", - "no_copy": 1, - "oldfieldname": "title", - "oldfieldtype": "Data", - "reqd": 1, - "unique": 1 - }, - { - "default": "0", - "fieldname": "disabled", - "fieldtype": "Check", - "label": "Disabled" - }, - { - "allow_in_quick_entry": 1, - "fieldname": "terms", - "fieldtype": "Text Editor", - "in_global_search": 1, - "label": "Terms and Conditions", - "oldfieldname": "terms", - "oldfieldtype": "Text Editor" - }, - { - "fieldname": "terms_and_conditions_help", - "fieldtype": "HTML", - "label": "Terms and Conditions Help", - "options": "
Delivery Terms for Order number {{ name }}\n\n-Order Date : {{ transaction_date }} \n-Expected Delivery Date : {{ delivery_date }}\n\n\n
The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
\n\nTemplates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
" - }, - { - "fieldname": "applicable_modules_section", - "fieldtype": "Section Break", - "label": "Applicable Modules" - }, - { - "default": "1", - "fieldname": "selling", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Selling" - }, - { - "default": "1", - "fieldname": "buying", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Buying" - }, - { - "fieldname": "section_break_7", - "fieldtype": "Section Break" - } - ], - "icon": "uil uil-file-alt", - "idx": 1, - "modified": "2023-02-20 16:33:50.446725", - "modified_by": "Administrator", - "module": "Setup", - "name": "Terms and Conditions", - "naming_rule": "By fieldname", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "import": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Sales Master Manager", - "share": 1, - "write": 1 - }, - { - "read": 1, - "role": "Sales User" - }, - { - "read": 1, - "role": "Purchase User" - }, - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Accounts User", - "share": 1, - "write": 1 - }, - { - "read": 1, - "role": "Stock User" - } - ], - "quick_entry": 1, - "show_name_in_global_search": 1, - "sort_field": "modified", - "sort_order": "ASC", - "states": [] - } + "actions": [], + "allow_import": 1, + "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. Examples: Validity of the offer, Payment Terms, Safety and Usage, etc.", + "doctype": "DocType", + "document_type": "Setup", + "engine": "InnoDB", + "field_order": [ + "title", + "disabled", + "applicable_modules_section", + "selling", + "buying", + "section_break_7", + "terms", + "terms_and_conditions_help" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "no_copy": 1, + "oldfieldname": "title", + "oldfieldtype": "Data", + "reqd": 1, + "unique": 1 + }, + { + "default": "0", + "fieldname": "disabled", + "fieldtype": "Check", + "label": "Disabled" + }, + { + "allow_in_quick_entry": 1, + "fieldname": "terms", + "fieldtype": "Text Editor", + "in_global_search": 1, + "label": "Terms and Conditions", + "oldfieldname": "terms", + "oldfieldtype": "Text Editor" + }, + { + "fieldname": "terms_and_conditions_help", + "fieldtype": "HTML", + "label": "Terms and Conditions Help", + "options": "Delivery Terms for Order number {{ name }}\n\n-Order Date : {{ transaction_date }} \n-Expected Delivery Date : {{ delivery_date }}\n\n\n
The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)
\n\nTemplates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.
" + }, + { + "fieldname": "applicable_modules_section", + "fieldtype": "Section Break", + "label": "Applicable Modules" + }, + { + "default": "1", + "fieldname": "selling", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Selling" + }, + { + "default": "1", + "fieldname": "buying", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Buying" + }, + { + "fieldname": "section_break_7", + "fieldtype": "Section Break" + } + ], + "icon": "icon-legal", + "idx": 1, + "links": [], + "modified": "2024-01-30 12:47:52.325531", + "modified_by": "Administrator", + "module": "Setup", + "name": "Terms and Conditions", + "naming_rule": "By fieldname", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "import": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Sales Master Manager", + "share": 1, + "write": 1 + }, + { + "read": 1, + "role": "Sales User" + }, + { + "read": 1, + "role": "Purchase User" + }, + { + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Accounts User", + "share": 1, + "write": 1 + }, + { + "read": 1, + "role": "Stock User" + } + ], + "quick_entry": 1, + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "ASC", + "states": [] +} diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json index b16b7b6defb6af186cf0ac87db5324d116e24ed7..e4055a6df2cf519646325b05abd1359d8d9794ca 100644 --- a/erpnext/stock/doctype/item_price/item_price.json +++ b/erpnext/stock/doctype/item_price/item_price.json @@ -3,7 +3,7 @@ "allow_import": 1, "autoname": "hash", "creation": "2013-05-02 16:29:48", - "description": "Multiple Item prices.", + "description": "Log the selling and buying rate of an Item", "doctype": "DocType", "document_type": "Setup", "engine": "InnoDB", @@ -253,7 +253,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2023-12-12 11:57:18.562754", + "modified": "2024-01-30 14:02:19.304854", "modified_by": "Administrator", "module": "Stock", "name": "Item Price", diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json index 2a74c77cc2c78230fccf7b76b07736cbd5dcf675..36302e4991038d848ab700f2e8a673c96eeb82ac 100644 --- a/erpnext/stock/doctype/price_list/price_list.json +++ b/erpnext/stock/doctype/price_list/price_list.json @@ -4,7 +4,7 @@ "allow_rename": 1, "autoname": "field:price_list_name", "creation": "2013-01-25 11:35:09", - "description": "Price List Master", + "description": "A Price List is a collection of Item Prices either Selling, Buying, or both", "doctype": "DocType", "document_type": "Setup", "engine": "InnoDB", @@ -83,10 +83,12 @@ "icon": "fa fa-tags", "idx": 1, "links": [], - "modified": "2023-12-08 16:03:01.935070", + "max_attachments": 1, + "modified": "2024-01-30 14:39:26.328837", "modified_by": "Administrator", "module": "Stock", "name": "Price List", + "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ { @@ -127,6 +129,6 @@ "search_fields": "currency", "show_name_in_global_search": 1, "sort_field": "modified", - "sort_order": "DESC", + "sort_order": "ASC", "states": [] } diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index bfa47a47c8395bec7185da91af7f422ee62beacc..3ef108d77a42048a5ad97d93aaa3ff61576145a8 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -1,7 +1,7 @@ { "actions": [], "creation": "2013-06-24 16:37:54", - "description": "Settings", + "description": "Default settings for your stock-related transactions", "doctype": "DocType", "engine": "InnoDB", "field_order": [ @@ -427,7 +427,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2023-12-08 16:03:01.935070", + "modified": "2024-01-30 14:03:52.143457", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings",