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

fix: Minor filter fix in expense claim type

Browse Source
This commit is contained in:
deepeshgarg007 2019-12-15 21:20:55 +05:30
parent 5ed8465788
commit 40b7ac4987
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@ -243,11 +243,11 @@ frappe.ui.form.on("Expense Claim", {
update_employee_advance_claimed_amount: function(frm) { update_employee_advance_claimed_amount: function(frm) {
let amount_to_be_allocated = frm.doc.grand_total; let amount_to_be_allocated = frm.doc.grand_total;
$.each(frm.doc.advances || [], function(i, advance){ $.each(frm.doc.advances || [], function(i, advance) {
if (amount_to_be_allocated >= advance.unclaimed_amount){ if (amount_to_be_allocated >= advance.unclaimed_amount) {
frm.doc.advances[i].allocated_amount = frm.doc.advances[i].unclaimed_amount; frm.doc.advances[i].allocated_amount = frm.doc.advances[i].unclaimed_amount;
amount_to_be_allocated -= advance.allocated_amount; amount_to_be_allocated -= advance.allocated_amount;
} else{ } else {
frm.doc.advances[i].allocated_amount = amount_to_be_allocated; frm.doc.advances[i].allocated_amount = amount_to_be_allocated;
amount_to_be_allocated = 0; amount_to_be_allocated = 0;
} }

5
erpnext/hr/doctype/expense_claim/expense_claim.json
View File

@ -1,4 +1,5 @@
{ {
"actions": [],
"allow_import": 1, "allow_import": 1,
"autoname": "naming_series:", "autoname": "naming_series:",
"creation": "2013-01-10 16:34:14", "creation": "2013-01-10 16:34:14",
@ -43,6 +44,7 @@
"accounting_dimensions_section", "accounting_dimensions_section",
"project", "project",
"dimension_col_break", "dimension_col_break",
"cost_center",
"more_details", "more_details",
"status", "status",
"amended_from", "amended_from",
@ -365,7 +367,8 @@
"icon": "fa fa-money", "icon": "fa fa-money",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2019-11-09 14:13:08.964547", "links": [],
"modified": "2019-12-14 23:52:05.388458",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim", "name": "Expense Claim",

6
erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
View File

@ -2,10 +2,10 @@
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Expense Claim Type", { frappe.ui.form.on("Expense Claim Type", {
refresh: function(frm){ refresh: function(frm) {
frm.fields_dict["accounts"].grid.get_field("default_account").get_query = function(frm, cdt, cdn){ frm.fields_dict["accounts"].grid.get_field("default_account").get_query = function(doc, cdt, cdn) {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
return{ return {
filters: { filters: {
"is_group": 0, "is_group": 0,
"root_type": frm.doc.deferred_expense_account ? "Asset" : "Expense", "root_type": frm.doc.deferred_expense_account ? "Asset" : "Expense",