nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 07:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Employee advance (#11875)

Browse Source 
* Employee Advances against Expense Claim

* added employee advance test cases and docs

* Default Employee Advance Account field in company

* Cleanup and fixes of employee advance
This commit is contained in:
Nabin Hait
2017-12-14 13:25:57 +05:30
committed by GitHub
parent 02b4b5f526
commit d0249b0880
28 changed files with 1445 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/setup/doctype/company/company.js
View File

@@ -165,7 +165,8 @@ erpnext.company.setup_queries = function(frm) {
["default_inventory_account", {"account_type": "Stock"}],
["cost_center", {}],
["round_off_cost_center", {}],
["depreciation_cost_center", {}]
["depreciation_cost_center", {}],
["default_employee_advance_account", {"root_type": "Asset"}],
], function(i, v) {
erpnext.company.set_custom_query(frm, v);
});
@@ -189,12 +190,14 @@ erpnext.company.set_custom_query = function(frm, v) {
"company": frm.doc.name,
"is_group": 0
};
for (var key in v[1])
for (var key in v[1]) {
filters[key] = v[1][key];
}
frm.set_query(v[0], function() {
return {
filters: filters
};
}
});
}

33
erpnext/setup/doctype/company/company.json
View File

@@ -964,6 +964,37 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "default_employee_advance_account",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Default Employee Advance Account",
"length": 0,
"no_copy": 1,
"options": "Account",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
@@ -2021,7 +2052,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2017-12-07 17:40:24.646920",
"modified": "2017-12-07 18:40:24.646920",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",