From d1863e6f9e668457108423258d864a7332216ea8 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Wed, 14 Oct 2020 06:59:53 +0200 Subject: [PATCH] fix: Chart of Accounts (#23530) * fix: Chart of Accounts * fix: Chart of Accounts with lower case "of" Co-authored-by: Marica Co-authored-by: Nabin Hait --- erpnext/accounts/desk_page/accounting/accounting.json | 2 +- erpnext/accounts/doctype/account/account_tree.js | 4 ++-- .../chart_of_accounts_importer/chart_of_accounts_importer.py | 2 +- erpnext/accounts/module_onboarding/accounts/accounts.json | 2 +- .../onboarding_step/chart_of_accounts/chart_of_accounts.json | 4 ++-- erpnext/config/getting_started.py | 4 ++-- erpnext/setup/desk_page/home/home.json | 2 +- erpnext/setup/doctype/company/company.json | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/erpnext/accounts/desk_page/accounting/accounting.json b/erpnext/accounts/desk_page/accounting/accounting.json index 045d8fb8a95..b0371e7c092 100644 --- a/erpnext/accounts/desk_page/accounting/accounting.json +++ b/erpnext/accounts/desk_page/accounting/accounting.json @@ -108,7 +108,7 @@ "pin_to_top": 0, "shortcuts": [ { - "label": "Chart Of Accounts", + "label": "Chart of Accounts", "link_to": "Account", "type": "DocType" }, diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js index 28b090bdadb..7bbc1c93e6c 100644 --- a/erpnext/accounts/doctype/account/account_tree.js +++ b/erpnext/accounts/doctype/account/account_tree.js @@ -2,7 +2,7 @@ frappe.provide("frappe.treeview_settings") frappe.treeview_settings["Account"] = { breadcrumb: "Accounts", - title: __("Chart Of Accounts"), + title: __("Chart of Accounts"), get_tree_root: false, filters: [ { @@ -97,7 +97,7 @@ frappe.treeview_settings["Account"] = { treeview.page.add_inner_button(__("Journal Entry"), function() { frappe.new_doc('Journal Entry', {company: get_company()}); }, __('Create')); - treeview.page.add_inner_button(__("New Company"), function() { + treeview.page.add_inner_button(__("Company"), function() { frappe.new_doc('Company'); }, __('Create')); diff --git a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py index e1b331be2b3..342f21b93a3 100644 --- a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py +++ b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py @@ -195,7 +195,7 @@ def build_response_as_excel(writer): reader = csv.reader(f) from frappe.utils.xlsxutils import make_xlsx - xlsx_file = make_xlsx(reader, "Chart Of Accounts Importer Template") + xlsx_file = make_xlsx(reader, "Chart of Accounts Importer Template") f.close() os.remove(filename) diff --git a/erpnext/accounts/module_onboarding/accounts/accounts.json b/erpnext/accounts/module_onboarding/accounts/accounts.json index ba1a779b4c1..570d2bd98e2 100644 --- a/erpnext/accounts/module_onboarding/accounts/accounts.json +++ b/erpnext/accounts/module_onboarding/accounts/accounts.json @@ -20,7 +20,7 @@ "owner": "Administrator", "steps": [ { - "step": "Chart Of Accounts" + "step": "Chart of Accounts" }, { "step": "Setup Taxes" diff --git a/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json b/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json index cbd022bfdbe..48637bf550b 100644 --- a/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json +++ b/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json @@ -10,11 +10,11 @@ "is_skipped": 0, "modified": "2020-05-14 17:40:28.410447", "modified_by": "Administrator", - "name": "Chart Of Accounts", + "name": "Chart of Accounts", "owner": "Administrator", "path": "Tree/Account", "reference_document": "Account", "show_full_form": 0, - "title": "Review Chart Of Accounts", + "title": "Review Chart of Accounts", "validate_action": 0 } \ No newline at end of file diff --git a/erpnext/config/getting_started.py b/erpnext/config/getting_started.py index fa84b1ce944..dc72316d08b 100644 --- a/erpnext/config/getting_started.py +++ b/erpnext/config/getting_started.py @@ -63,8 +63,8 @@ def get_data(): { "type": "doctype", "name": "Chart of Accounts Importer", - "labe": _("Chart Of Accounts Importer"), - "description": _("Import Chart Of Accounts from CSV / Excel files"), + "label": _("Chart of Accounts Importer"), + "description": _("Import Chart of Accounts from CSV / Excel files"), "onboard": 1 }, { diff --git a/erpnext/setup/desk_page/home/home.json b/erpnext/setup/desk_page/home/home.json index 63cd5c5ceca..9cf9f419072 100644 --- a/erpnext/setup/desk_page/home/home.json +++ b/erpnext/setup/desk_page/home/home.json @@ -43,7 +43,7 @@ { "hidden": 0, "label": "Data Import and Settings", - "links": "[\n {\n \"description\": \"Import Data from CSV / Excel files.\",\n \"icon\": \"octicon octicon-cloud-upload\",\n \"label\": \"Import Data\",\n \"name\": \"Data Import\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Import Chart Of Accounts from CSV / Excel files\",\n \"labe\": \"Chart Of Accounts Importer\",\n \"label\": \"Chart of Accounts Importer\",\n \"name\": \"Chart of Accounts Importer\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Letter Heads for print templates.\",\n \"label\": \"Letter Head\",\n \"name\": \"Letter Head\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Add / Manage Email Accounts.\",\n \"label\": \"Email Account\",\n \"name\": \"Email Account\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n }\n]" + "links": "[\n {\n \"description\": \"Import Data from CSV / Excel files.\",\n \"icon\": \"octicon octicon-cloud-upload\",\n \"label\": \"Import Data\",\n \"name\": \"Data Import\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Import Chart of Accounts from CSV / Excel files\",\n \"label\": \"Chart of Accounts Importer\",\n \"label\": \"Chart of Accounts Importer\",\n \"name\": \"Chart of Accounts Importer\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Letter Heads for print templates.\",\n \"label\": \"Letter Head\",\n \"name\": \"Letter Head\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Add / Manage Email Accounts.\",\n \"label\": \"Email Account\",\n \"name\": \"Email Account\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n }\n]" } ], "category": "Modules", diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index 4a26a71970c..40938ea0a5e 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -261,14 +261,14 @@ { "fieldname": "create_chart_of_accounts_based_on", "fieldtype": "Select", - "label": "Create Chart Of Accounts Based On", + "label": "Create Chart of Accounts Based on", "options": "\nStandard Template\nExisting Company" }, { "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"", "fieldname": "chart_of_accounts", "fieldtype": "Select", - "label": "Chart Of Accounts Template", + "label": "Chart of Accounts Template", "no_copy": 1 }, {