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

[enhance] Add Accounts table in to mention expense account based on company #5777

Browse Source
This commit is contained in:
Saurabh
2016-07-18 15:20:47 +05:30
parent f589c82d68
commit 718d835f45
12 changed files with 225 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/demo/setup_data.py
View File

@@ -317,7 +317,10 @@ def setup_account_to_expense_type():
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():

4
erpnext/demo/user/hr.py
View File

@@ -63,7 +63,9 @@ def work():
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