fix(demo): Default accounts for demo company
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
index d1a0def..12f517d 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
@@ -69,8 +69,7 @@
"Persediaan Barang": {
"Persediaan Barang": {
"account_number": "1141.000",
- "account_type": "Stock",
- "is_group": 1
+ "account_type": "Stock"
},
"Uang Muka Pembelian": {
"Uang Muka Pembelian": {
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index ba200ef..3cbec3e 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -45,7 +45,8 @@
fieldname: 'setup_demo',
label: __('Generate Demo Data for Exploration'),
fieldtype: 'Check',
- description: 'If checked, we will create demo data for you to explore the system. This demo data can be erased later.'},
+ description: __('If checked, we will create demo data for you to explore the system. This demo data can be erased later.')
+ },
],
onload: function (slide) {
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index fcdf245..2db2752 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -403,14 +403,18 @@
self._set_default_account(default_account, default_accounts.get(default_account))
if not self.default_income_account:
- income_account = frappe.db.get_value(
- "Account", {"account_name": _("Sales"), "company": self.name, "is_group": 0}
+ income_account = frappe.db.get_all(
+ "Account",
+ filters={"company": self.name, "is_group": 0},
+ or_filters={
+ "account_name": ("in", [_("Sales"), _("Sales Account")]),
+ "account_type": "Income Account",
+ },
+ pluck="name",
)
- if not income_account:
- income_account = frappe.db.get_value(
- "Account", {"account_name": _("Sales Account"), "company": self.name}
- )
+ if income_account:
+ income_account = income_account[0]
self.db_set("default_income_account", income_account)