From b39c17dd55a3b10934a6d69be3ae4565ac767941 Mon Sep 17 00:00:00 2001 From: Michelle Alva <50285544+michellealva@users.noreply.github.com> Date: Fri, 23 Oct 2020 18:22:26 +0530 Subject: [PATCH] fix: Typo/Grammatical fixes in Settings (#23612) * fix(Stock Settings): Type/Grammatical fixes in Settings * fix: grammatical fixes in manufacturing settings * fix: typo fix in accounting settings * fix: typo fixes in HR settings * fix: typo fixes in buying settings * fix: typo fixes in Selling Settings * Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json Co-authored-by: Sagar Vora * Apply suggestions from code review Co-authored-by: Sagar Vora * Apply suggestions from code review Co-authored-by: Sagar Vora * Update accounts_settings.json Co-authored-by: Marica Co-authored-by: Nabin Hait Co-authored-by: Rushabh Mehta Co-authored-by: Sagar Vora --- .../accounts_settings/accounts_settings.json | 26 +++---- .../buying_settings/buying_settings.json | 13 ++-- .../hr/doctype/hr_settings/hr_settings.json | 78 ++++++------------- .../manufacturing_settings.json | 21 ++--- .../selling_settings/selling_settings.json | 21 ++--- .../stock_settings/stock_settings.json | 25 +++--- 6 files changed, 78 insertions(+), 106 deletions(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 4d3cbea6bc..41f9ce030a 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -40,7 +40,7 @@ "fields": [ { "default": "1", - "description": "If enabled, the system will post accounting entries for inventory automatically.", + "description": "If enabled, the system will post accounting entries for inventory automatically", "fieldname": "auto_accounting_for_stock", "fieldtype": "Check", "hidden": 1, @@ -48,23 +48,23 @@ "label": "Make Accounting Entry For Every Stock Movement" }, { - "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.", + "description": "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below", "fieldname": "acc_frozen_upto", "fieldtype": "Date", "in_list_view": 1, - "label": "Accounts Frozen Upto" + "label": "Accounts Frozen Till Date" }, { "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts", "fieldname": "frozen_accounts_modifier", "fieldtype": "Link", "in_list_view": 1, - "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries", + "label": "Role Allowed to Set Frozen Accounts and Edit Frozen Entries", "options": "Role" }, { "default": "Billing Address", - "description": "Address used to determine Tax Category in transactions.", + "description": "Address used to determine Tax Category in transactions", "fieldname": "determine_address_tax_category_from", "fieldtype": "Select", "label": "Determine Address Tax Category From", @@ -75,7 +75,7 @@ "fieldtype": "Column Break" }, { - "description": "Role that is allowed to submit transactions that exceed credit limits set.", + "description": "This role is allowed to submit transactions that exceed credit limits", "fieldname": "credit_controller", "fieldtype": "Link", "in_list_view": 1, @@ -127,7 +127,7 @@ "default": "0", "fieldname": "show_inclusive_tax_in_print", "fieldtype": "Check", - "label": "Show Inclusive Tax In Print" + "label": "Show Inclusive Tax in Print" }, { "fieldname": "column_break_12", @@ -165,7 +165,7 @@ }, { "default": "0", - "description": "Only select if you have setup Cash Flow Mapper documents", + "description": "Only select this if you have set up the Cash Flow Mapper documents", "fieldname": "use_custom_cash_flow", "fieldtype": "Check", "label": "Use Custom Cash Flow Format" @@ -177,7 +177,7 @@ "label": "Automatically Fetch Payment Terms" }, { - "description": "Percentage you are allowed to bill more against the amount ordered. For example: If the order value is $100 for an item and tolerance is set as 10% then you are allowed to bill for $110.", + "description": "The percentage you are allowed to bill more against the amount ordered. For example, if the order value is $100 for an item and tolerance is set as 10%, then you are allowed to bill up to $110 ", "fieldname": "over_billing_allowance", "fieldtype": "Currency", "label": "Over Billing Allowance (%)" @@ -199,7 +199,7 @@ }, { "default": "0", - "description": "If this is unchecked direct GL Entries will be created to book Deferred Revenue/Expense", + "description": "If this is unchecked, direct GL entries will be created to book deferred revenue or expense", "fieldname": "book_deferred_entries_via_journal_entry", "fieldtype": "Check", "label": "Book Deferred Entries Via Journal Entry" @@ -214,7 +214,7 @@ }, { "default": "Days", - "description": "If \"Months\" is selected then fixed amount will be booked as deferred revenue or expense for each month irrespective of number of days in a month. Will be prorated if deferred revenue or expense is not booked for an entire month.", + "description": "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month", "fieldname": "book_deferred_entries_based_on", "fieldtype": "Select", "label": "Book Deferred Entries Based On", @@ -226,7 +226,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2020-10-07 14:58:50.325577", + "modified": "2020-10-13 11:32:52.268826", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings", @@ -254,4 +254,4 @@ "sort_field": "modified", "sort_order": "ASC", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json index a0ab2a00f9..618212da80 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.json +++ b/erpnext/buying/doctype/buying_settings/buying_settings.json @@ -46,26 +46,26 @@ { "fieldname": "po_required", "fieldtype": "Select", - "label": "Purchase Order Required for Purchase Invoice & Receipt Creation", + "label": "Is Purchase Order Required for Purchase Invoice & Receipt Creation?", "options": "No\nYes" }, { "fieldname": "pr_required", "fieldtype": "Select", - "label": "Purchase Receipt Required for Purchase Invoice Creation", + "label": "Is Purchase Receipt Required for Purchase Invoice Creation?", "options": "No\nYes" }, { "default": "0", "fieldname": "maintain_same_rate", "fieldtype": "Check", - "label": "Maintain same rate throughout purchase cycle" + "label": "Maintain Same Rate Throughout the Purchase Cycle" }, { "default": "0", "fieldname": "allow_multiple_items", "fieldtype": "Check", - "label": "Allow Item to be added multiple times in a transaction" + "label": "Allow Item To Be Added Multiple Times in a Transaction" }, { "fieldname": "subcontract", @@ -93,9 +93,10 @@ ], "icon": "fa fa-cog", "idx": 1, + "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2020-05-15 14:49:32.513611", + "modified": "2020-10-13 12:00:23.276329", "modified_by": "Administrator", "module": "Buying", "name": "Buying Settings", @@ -113,4 +114,4 @@ ], "sort_field": "modified", "sort_order": "DESC" -} \ No newline at end of file +} diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json index c42e1d72fc..4374d2911a 100644 --- a/erpnext/hr/doctype/hr_settings/hr_settings.json +++ b/erpnext/hr/doctype/hr_settings/hr_settings.json @@ -28,144 +28,110 @@ { "fieldname": "employee_settings", "fieldtype": "Section Break", - "label": "Employee Settings", - "show_days": 1, - "show_seconds": 1 + "label": "Employee Settings" }, { "description": "Enter retirement age in years", "fieldname": "retirement_age", "fieldtype": "Data", - "label": "Retirement Age", - "show_days": 1, - "show_seconds": 1 + "label": "Retirement Age" }, { "default": "Naming Series", - "description": "Employee record is created using selected field. ", + "description": "Employee records are created using the selected field", "fieldname": "emp_created_by", "fieldtype": "Select", - "label": "Employee Records to be created by", - "options": "Naming Series\nEmployee Number\nFull Name", - "show_days": 1, - "show_seconds": 1 + "label": "Employee Records to Be Created By", + "options": "Naming Series\nEmployee Number\nFull Name" }, { "fieldname": "column_break_4", - "fieldtype": "Column Break", - "show_days": 1, - "show_seconds": 1 + "fieldtype": "Column Break" }, { "default": "0", - "description": "Don't send Employee Birthday Reminders", + "description": "Don't send employee birthday reminders", "fieldname": "stop_birthday_reminders", "fieldtype": "Check", - "label": "Stop Birthday Reminders", - "show_days": 1, - "show_seconds": 1 + "label": "Stop Birthday Reminders" }, { "default": "1", "fieldname": "expense_approver_mandatory_in_expense_claim", "fieldtype": "Check", - "label": "Expense Approver Mandatory In Expense Claim", - "show_days": 1, - "show_seconds": 1 + "label": "Expense Approver Mandatory In Expense Claim" }, { "collapsible": 1, "fieldname": "leave_settings", "fieldtype": "Section Break", - "label": "Leave Settings", - "show_days": 1, - "show_seconds": 1 + "label": "Leave Settings" }, { "fieldname": "leave_approval_notification_template", "fieldtype": "Link", "label": "Leave Approval Notification Template", - "options": "Email Template", - "show_days": 1, - "show_seconds": 1 + "options": "Email Template" }, { "fieldname": "leave_status_notification_template", "fieldtype": "Link", "label": "Leave Status Notification Template", - "options": "Email Template", - "show_days": 1, - "show_seconds": 1 + "options": "Email Template" }, { "fieldname": "column_break_18", - "fieldtype": "Column Break", - "show_days": 1, - "show_seconds": 1 + "fieldtype": "Column Break" }, { "default": "1", "fieldname": "leave_approver_mandatory_in_leave_application", "fieldtype": "Check", - "label": "Leave Approver Mandatory In Leave Application", - "show_days": 1, - "show_seconds": 1 + "label": "Leave Approver Mandatory In Leave Application" }, { "default": "0", "fieldname": "show_leaves_of_all_department_members_in_calendar", "fieldtype": "Check", - "label": "Show Leaves Of All Department Members In Calendar", - "show_days": 1, - "show_seconds": 1 + "label": "Show Leaves Of All Department Members In Calendar" }, { "collapsible": 1, "fieldname": "hiring_settings", "fieldtype": "Section Break", - "label": "Hiring Settings", - "show_days": 1, - "show_seconds": 1 + "label": "Hiring Settings" }, { "default": "0", "fieldname": "check_vacancies", "fieldtype": "Check", - "label": "Check Vacancies On Job Offer Creation", - "show_days": 1, - "show_seconds": 1 + "label": "Check Vacancies On Job Offer Creation" }, { "default": "0", "fieldname": "auto_leave_encashment", "fieldtype": "Check", - "label": "Auto Leave Encashment", - "show_days": 1, - "show_seconds": 1 + "label": "Auto Leave Encashment" }, { "default": "0", "fieldname": "restrict_backdated_leave_application", "fieldtype": "Check", - "label": "Restrict Backdated Leave Application", - "show_days": 1, - "show_seconds": 1 + "label": "Restrict Backdated Leave Applications" }, { "depends_on": "eval:doc.restrict_backdated_leave_application == 1", "fieldname": "role_allowed_to_create_backdated_leave_application", "fieldtype": "Link", "label": "Role Allowed to Create Backdated Leave Application", - "options": "Role", - "show_days": 1, - "show_seconds": 1 + "options": "Role" } ], "icon": "fa fa-cog", "idx": 1, "issingle": 1, "links": [], - "modified": "2020-06-04 15:15:09.865476", + "modified": "2020-10-13 11:49:46.168027", "modified_by": "Administrator", "module": "HR", "name": "HR Settings", @@ -183,4 +149,4 @@ ], "sort_field": "modified", "sort_order": "ASC" -} \ No newline at end of file +} diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json index 86fa7a8901..b7634da87c 100644 --- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json @@ -1,4 +1,5 @@ { + "actions": [], "creation": "2014-11-27 14:12:07.542534", "doctype": "DocType", "document_type": "Document", @@ -36,7 +37,7 @@ { "default": "0", "depends_on": "eval:!doc.disable_capacity_planning", - "description": "Plan time logs outside Workstation Working Hours.", + "description": "Plan time logs outside Workstation working hours", "fieldname": "allow_overtime", "fieldtype": "Check", "label": "Allow Overtime" @@ -56,17 +57,17 @@ { "default": "30", "depends_on": "eval:!doc.disable_capacity_planning", - "description": "Try planning operations for X days in advance.", + "description": "Plan operations X days in advance", "fieldname": "capacity_planning_for_days", "fieldtype": "Int", "label": "Capacity Planning For (Days)" }, { "depends_on": "eval:!doc.disable_capacity_planning", - "description": "Default 10 mins", + "description": "Default: 10 mins", "fieldname": "mins_between_operations", "fieldtype": "Int", - "label": "Time Between Operations (in mins)" + "label": "Time Between Operations (Mins)" }, { "fieldname": "section_break_6", @@ -92,14 +93,14 @@ }, { "default": "0", - "description": "Allow multiple Material Consumption against a Work Order", + "description": "Allow multiple material consumptions against a Work Order", "fieldname": "material_consumption", "fieldtype": "Check", "label": "Allow Multiple Material Consumption" }, { "default": "0", - "description": "Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.", + "description": "Update BOM cost automatically via scheduler, based on the latest Valuation Rate/Price List Rate/Last Purchase Rate of raw materials", "fieldname": "update_bom_costs_automatically", "fieldtype": "Check", "label": "Update BOM Cost Automatically" @@ -135,7 +136,7 @@ { "fieldname": "over_production_for_sales_and_work_order_section", "fieldtype": "Section Break", - "label": "Over Production for Sales and Work Order" + "label": "Overproduction for Sales and Work Order" }, { "fieldname": "raw_materials_consumption_section", @@ -157,8 +158,10 @@ } ], "icon": "icon-wrench", + "index_web_pages_for_search": 1, "issingle": 1, - "modified": "2019-11-26 13:10:45.569341", + "links": [], + "modified": "2020-10-13 10:55:43.996581", "modified_by": "Administrator", "module": "Manufacturing", "name": "Manufacturing Settings", @@ -175,4 +178,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index dcbc0748f7..4044f09c85 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -63,7 +63,7 @@ }, { "default": "15", - "description": "Auto close Opportunity after 15 days", + "description": "Auto close Opportunity after the no. of days mentioned above", "fieldname": "close_opportunity_after_days", "fieldtype": "Int", "label": "Close Opportunity After Days" @@ -80,18 +80,18 @@ { "fieldname": "so_required", "fieldtype": "Select", - "label": "Sales Order Required for Sales Invoice & Delivery Note Creation", + "label": "Is Sales Order Required for Sales Invoice & Delivery Note Creation?", "options": "No\nYes" }, { "fieldname": "dn_required", "fieldtype": "Select", - "label": "Delivery Note Required for Sales Invoice Creation", + "label": "Is Delivery Note Required for Sales Invoice Creation?", "options": "No\nYes" }, { "default": "Each Transaction", - "description": "How often should project and company be updated based on Sales Transactions.", + "description": "How often should Project and Company be updated based on Sales Transactions?", "fieldname": "sales_update_frequency", "fieldtype": "Select", "label": "Sales Update Frequency", @@ -108,38 +108,39 @@ "default": "0", "fieldname": "editable_price_list_rate", "fieldtype": "Check", - "label": "Allow user to edit Price List Rate in transactions" + "label": "Allow User to Edit Price List Rate in Transactions" }, { "default": "0", "fieldname": "allow_multiple_items", "fieldtype": "Check", - "label": "Allow Item to be added multiple times in a transaction" + "label": "Allow Item to Be Added Multiple Times in a Transaction" }, { "default": "0", "fieldname": "allow_against_multiple_purchase_orders", "fieldtype": "Check", - "label": "Allow multiple Sales Orders against a Customer's Purchase Order" + "label": "Allow Multiple Sales Orders Against a Customer's Purchase Order" }, { "default": "0", "fieldname": "validate_selling_price", "fieldtype": "Check", - "label": "Validate Selling Price for Item against Purchase Rate or Valuation Rate" + "label": "Validate Selling Price for Item Against Purchase Rate or Valuation Rate" }, { "default": "0", "fieldname": "hide_tax_id", "fieldtype": "Check", - "label": "Hide Customer's Tax Id from Sales Transactions" + "label": "Hide Customer's Tax ID from Sales Transactions" } ], "icon": "fa fa-cog", "idx": 1, + "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2020-06-01 13:58:35.637858", + "modified": "2020-10-13 12:12:56.784014", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings", diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 9c5d3d8340..067659f64a 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -82,7 +82,7 @@ "options": "FIFO\nMoving Average" }, { - "description": "Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.", + "description": "The percentage you are allowed to receive or deliver more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed to receive 110 units.", "fieldname": "over_delivery_receipt_allowance", "fieldtype": "Float", "label": "Over Delivery/Receipt Allowance (%)" @@ -91,7 +91,7 @@ "default": "Stop", "fieldname": "action_if_quality_inspection_is_not_submitted", "fieldtype": "Select", - "label": "Action if Quality inspection is not submitted", + "label": "Action If Quality Inspection Is Not Submitted", "options": "Stop\nWarn" }, { @@ -114,7 +114,7 @@ "default": "0", "fieldname": "auto_insert_price_list_rate_if_missing", "fieldtype": "Check", - "label": "Auto insert Price List rate if missing" + "label": "Auto Insert Price List Rate If Missing" }, { "default": "0", @@ -130,13 +130,13 @@ "default": "1", "fieldname": "automatically_set_serial_nos_based_on_fifo", "fieldtype": "Check", - "label": "Automatically Set Serial Nos based on FIFO" + "label": "Automatically Set Serial Nos Based on FIFO" }, { "default": "1", "fieldname": "set_qty_in_transactions_based_on_serial_no_input", "fieldtype": "Check", - "label": "Set Qty in Transactions based on Serial No Input" + "label": "Set Qty in Transactions Based on Serial No Input" }, { "fieldname": "auto_material_request", @@ -147,13 +147,13 @@ "default": "0", "fieldname": "auto_indent", "fieldtype": "Check", - "label": "Raise Material Request when stock reaches re-order level" + "label": "Raise Material Request When Stock Reaches Re-order Level" }, { "default": "0", "fieldname": "reorder_email_notify", "fieldtype": "Check", - "label": "Notify by Email on creation of automatic Material Request" + "label": "Notify by Email on Creation of Automatic Material Request" }, { "fieldname": "freeze_stock_entries", @@ -168,12 +168,12 @@ { "fieldname": "stock_frozen_upto_days", "fieldtype": "Int", - "label": "Freeze Stocks Older Than [Days]" + "label": "Freeze Stocks Older Than (Days)" }, { "fieldname": "stock_auth_role", "fieldtype": "Link", - "label": "Role Allowed to edit frozen stock", + "label": "Role Allowed to Edit Frozen Stock", "options": "Role" }, { @@ -203,20 +203,21 @@ "default": "0", "fieldname": "allow_from_dn", "fieldtype": "Check", - "label": "Allow Material Transfer From Delivery Note and Sales Invoice" + "label": "Allow Material Transfer from Delivery Note to Sales Invoice" }, { "default": "0", "fieldname": "allow_from_pr", "fieldtype": "Check", - "label": "Allow Material Transfer From Purchase Receipt and Purchase Invoice" + "label": "Allow Material Transfer from Purchase Receipt to Purchase Invoice" } ], "icon": "icon-cog", "idx": 1, + "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2020-06-20 11:39:15.344112", + "modified": "2020-10-13 10:33:29.147682", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings",