Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(demo): Default accounts for demo company

Browse Source
This commit is contained in:
Deepesh Garg 2023-08-24 17:58:51 +05:30
parent 6349b67df4
commit 5f75aea6fa
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
View File

@ -437,12 +437,20 @@
}, },
"Sales": { "Sales": {
"Sales from Other Regions": { "Sales from Other Regions": {
"Sales from Other Region": {} "Sales from Other Region": {
"account_type": "Income Account"
}
}, },
"Sales of same region": { "Sales of same region": {
"Management Consultancy Fees 1": {}, "Management Consultancy Fees 1": {
"Sales Account": {}, "account_type": "Income Account"
"Sales of I/C": {} },
"Sales Account": {
"account_type": "Income Account"
},
"Sales of I/C": {
"account_type": "Income Account"
}
} }
}, },
"root_type": "Income" "root_type": "Income"

3
erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
View File

@ -669,7 +669,8 @@
}, },
"Penjualan Barang Dagangan": { "Penjualan Barang Dagangan": {
"Penjualan": { "Penjualan": {
"account_number": "4110.000" "account_number": "4110.000",
"account_type": "Income Account"
}, },
"Potongan Penjualan": { "Potongan Penjualan": {
"account_number": "4130.000" "account_number": "4130.000"

4
erpnext/accounts/general_ledger.py
View File

@ -539,6 +539,10 @@ def get_round_off_account_and_cost_center(
"Company", company, ["round_off_account", "round_off_cost_center"] "Company", company, ["round_off_account", "round_off_cost_center"]
) or [None, None] ) or [None, None]
# Use expense account as fallback
if not round_off_account:
round_off_account = frappe.get_cached_value("Company", company, "default_expense_account")
meta = frappe.get_meta(voucher_type) meta = frappe.get_meta(voucher_type)
# Give first preference to parent cost center for round off GLE # Give first preference to parent cost center for round off GLE