[enhance] Add Accounts table in to mention expense account based on company #5777
diff --git a/erpnext/demo/setup_data.py b/erpnext/demo/setup_data.py
index 0ac77f4..0903482 100644
--- a/erpnext/demo/setup_data.py
+++ b/erpnext/demo/setup_data.py
@@ -317,7 +317,10 @@
for expense_type in expense_types:
doc = frappe.get_doc("Expense Claim Type", expense_type["name"])
- doc.default_account = expense_type["account"]
+ doc.append("accounts", {
+ "company" : erpnext.get_default_company(),
+ "default_account" : expense_type["account"]
+ })
doc.save(ignore_permissions=True)
def setup_user_roles():
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 50bb173..c5cbe6b 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -63,7 +63,9 @@
def get_expenses():
expenses = []
- expese_types = frappe.db.sql("select name, default_account from `tabExpense Claim Type`",as_dict=1)
+ expese_types = frappe.db.sql("""select ect.name, eca.default_account from `tabExpense Claim Type` ect,
+ `tabExpense Claim Account` eca where eca.parent=ect.name
+ and eca.company=%s """, frappe.flags.company,as_dict=1)
for expense_type in expese_types[:random.randint(1,4)]:
claim_amount = random.randint(1,20)*10