[fix] test case fix for expense claim
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index c5cbe6b..bd86507 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -43,7 +43,7 @@
rand = random.random()
- if rand >= 0.3 and rand <= 0.6 :
+ if rand < 0.4:
expense_claim.approval_status = "Approved"
update_sanctioned_amount(expense_claim)
expense_claim.submit()
@@ -57,7 +57,7 @@
je.flags.ignore_permissions = 1
je.submit()
- if rand < 0.3:
+ elif rand < 0.2:
expense_claim.approval_status = "Rejected"
expense_claim.submit()
diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
index b21f2a1..59d686e 100644
--- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
@@ -30,7 +30,7 @@
"project": "_Test Project 1",
"task": task_name,
"expenses":
- [{ "expense_type": "Food", "claim_amount": 300, "sanctioned_amount": 200 }]
+ [{ "expense_type": "Food", "default_account": "Entertainment Expenses - _TC", "claim_amount": 300, "sanctioned_amount": 200 }]
})
expense_claim.submit()
@@ -44,7 +44,7 @@
"project": "_Test Project 1",
"task": task_name,
"expenses":
- [{ "expense_type": "Food", "claim_amount": 600, "sanctioned_amount": 500 }]
+ [{ "expense_type": "Food", "default_account": "Entertainment Expenses - _TC", "claim_amount": 600, "sanctioned_amount": 500 }]
})
expense_claim2.submit()
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
index 5624570..fda6809 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
@@ -1,13 +1,17 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-cur_frm.set_query("default_account", "accounts", function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
- return{
- filters: {
- "is_group": 0,
- "root_type": "Expense",
- 'company': d.company
+frappe.ui.form.on("Expense Claim Type", {
+ refresh: function(frm){
+ frm.fields_dict["accounts"].grid.get_field("default_account").get_query = function(frm, cdt, cdn){
+ var d = locals[cdt][cdn];
+ return{
+ filters: {
+ "is_group": 0,
+ "root_type": "Expense",
+ 'company': d.company
+ }
+ }
}
}
-});
\ No newline at end of file
+})