nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Chart of Accounts (#23530)

Browse Source 
* fix: Chart of Accounts

* fix: Chart of Accounts with lower case "of"

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
This commit is contained in:
Raffael Meyer
2020-10-14 06:59:53 +02:00
committed by GitHub
parent 31417864cb
commit d1863e6f9e
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/desk_page/accounting/accounting.json
View File

@@ -108,7 +108,7 @@
"pin_to_top": 0, "pin_to_top": 0,
"shortcuts": [ "shortcuts": [
{ {
"label": "Chart Of Accounts", "label": "Chart of Accounts",
"link_to": "Account", "link_to": "Account",
"type": "DocType" "type": "DocType"
}, },

4
erpnext/accounts/doctype/account/account_tree.js
View File

@@ -2,7 +2,7 @@ frappe.provide("frappe.treeview_settings")
frappe.treeview_settings["Account"] = { frappe.treeview_settings["Account"] = {
breadcrumb: "Accounts", breadcrumb: "Accounts",
title: __("Chart Of Accounts"), title: __("Chart of Accounts"),
get_tree_root: false, get_tree_root: false,
filters: [ filters: [
{ {
@@ -97,7 +97,7 @@ frappe.treeview_settings["Account"] = {
treeview.page.add_inner_button(__("Journal Entry"), function() { treeview.page.add_inner_button(__("Journal Entry"), function() {
frappe.new_doc('Journal Entry', {company: get_company()}); frappe.new_doc('Journal Entry', {company: get_company()});
}, __('Create')); }, __('Create'));
treeview.page.add_inner_button(__("New Company"), function() { treeview.page.add_inner_button(__("Company"), function() {
frappe.new_doc('Company'); frappe.new_doc('Company');
}, __('Create')); }, __('Create'));

2
erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
View File

@@ -195,7 +195,7 @@ def build_response_as_excel(writer):
reader = csv.reader(f) reader = csv.reader(f)
from frappe.utils.xlsxutils import make_xlsx 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() f.close()
os.remove(filename) os.remove(filename)

2
erpnext/accounts/module_onboarding/accounts/accounts.json
View File

@@ -20,7 +20,7 @@
"owner": "Administrator", "owner": "Administrator",
"steps": [ "steps": [
{ {
"step": "Chart Of Accounts" "step": "Chart of Accounts"
}, },
{ {
"step": "Setup Taxes" "step": "Setup Taxes"

4
erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json
View File

@@ -10,11 +10,11 @@
"is_skipped": 0, "is_skipped": 0,
"modified": "2020-05-14 17:40:28.410447", "modified": "2020-05-14 17:40:28.410447",
"modified_by": "Administrator", "modified_by": "Administrator",
"name": "Chart Of Accounts", "name": "Chart of Accounts",
"owner": "Administrator", "owner": "Administrator",
"path": "Tree/Account", "path": "Tree/Account",
"reference_document": "Account", "reference_document": "Account",
"show_full_form": 0, "show_full_form": 0,
"title": "Review Chart Of Accounts", "title": "Review Chart of Accounts",
"validate_action": 0 "validate_action": 0
} }

4
erpnext/config/getting_started.py
View File

@@ -63,8 +63,8 @@ def get_data():
{ {
"type": "doctype", "type": "doctype",
"name": "Chart of Accounts Importer", "name": "Chart of Accounts Importer",
"labe": _("Chart Of Accounts Importer"), "label": _("Chart of Accounts Importer"),
"description": _("Import Chart Of Accounts from CSV / Excel files"), "description": _("Import Chart of Accounts from CSV / Excel files"),
"onboard": 1 "onboard": 1
}, },
{ {

2
erpnext/setup/desk_page/home/home.json
View File

@@ -43,7 +43,7 @@
{ {
"hidden": 0, "hidden": 0,
"label": "Data Import and Settings", "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", "category": "Modules",

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

@@ -261,14 +261,14 @@
{ {
"fieldname": "create_chart_of_accounts_based_on", "fieldname": "create_chart_of_accounts_based_on",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Create Chart Of Accounts Based On", "label": "Create Chart of Accounts Based on",
"options": "\nStandard Template\nExisting Company" "options": "\nStandard Template\nExisting Company"
}, },
{ {
"depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"", "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
"fieldname": "chart_of_accounts", "fieldname": "chart_of_accounts",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Chart Of Accounts Template", "label": "Chart of Accounts Template",
"no_copy": 1 "no_copy": 1
}, },
{ {